Allow more alternative forms of scalar reflect function
Bug: 22859221
Change-Id: Iff34d861642b8d4b8a1cdc932529d98ac7c71005
diff --git a/modules/glshared/glsBuiltinPrecisionTests.cpp b/modules/glshared/glsBuiltinPrecisionTests.cpp
index fdb5295..3994a65 100644
--- a/modules/glshared/glsBuiltinPrecisionTests.cpp
+++ b/modules/glshared/glsBuiltinPrecisionTests.cpp
@@ -3073,6 +3073,33 @@
}
};
+template<int Size, typename Ret, typename Arg0, typename Arg1>
+struct ApplyReflect
+{
+ static ExprP<Ret> apply (ExpandContext& ctx,
+ const ExprP<Arg0>& i,
+ const ExprP<Arg1>& n)
+ {
+ const ExprP<float> dotNI = bindExpression("dotNI", ctx, dot(n, i));
+
+ return i - alternatives((n * dotNI) * constant(2.0f),
+ n * (dotNI * constant(2.0f)));
+ };
+};
+
+template<typename Ret, typename Arg0, typename Arg1>
+struct ApplyReflect<1, Ret, Arg0, Arg1>
+{
+ static ExprP<Ret> apply (ExpandContext& ctx,
+ const ExprP<Arg0>& i,
+ const ExprP<Arg1>& n)
+ {
+ return i - alternatives(alternatives((n * (n*i)) * constant(2.0f),
+ n * ((n*i) * constant(2.0f))),
+ (n * n) * (i * constant(2.0f)));
+ };
+};
+
template <int Size>
class Reflect : public DerivedFunc<
Signature<typename ContainerOf<float, Size>::Container,
@@ -3095,10 +3122,8 @@
{
const ExprP<Arg0>& i = args.a;
const ExprP<Arg1>& n = args.b;
- const ExprP<float> dotNI = bindExpression("dotNI", ctx, dot(n, i));
- return i - alternatives((n * dotNI) * constant(2.0f),
- n * (dotNI * constant(2.0f)));
+ return ApplyReflect<Size, Ret, Arg0, Arg1>::apply(ctx, i, n);
}
};