commit 1155ddd242fb20ffb39e14a01eec1d39c366258f
author Arun Patole <apatole@nvidia.com> Fri Jun 05 18:04:36 2015 +0530
committer Olli Etuaho <oetuaho@nvidia.com> Mon Jun 08 08:19:20 2015 +0000
tree 0c111ad7be367165c37476ea19dae52b6fca9362
parent 64f0be91d2856ecd07ddfe53dd76df115e23b906

Revert "Revert "Add constant folding support for geometric built-ins""

Revert of revert as the issue is with the failing test itself.

This reverts commit b3da45c12d3eecdd319c0feb4d2b933e144f816a.

Change-Id: Ie2003c78527f87cad7f8ead0d87fee75ce032379
Reviewed-on: https://chromium-review.googlesource.com/275487
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Tested-by: Olli Etuaho <oetuaho@nvidia.com>

src/compiler/translator/Intermediate.cpp

diff --git a/src/compiler/translator/Intermediate.cpp b/src/compiler/translator/Intermediate.cpp
index a5f83a4..1d8b36b 100644
--- a/src/compiler/translator/Intermediate.cpp
+++ b/src/compiler/translator/Intermediate.cpp
@@ -477,6 +477,12 @@
       case EOpGreaterThanEqual:
       case EOpVectorEqual:
       case EOpVectorNotEqual:
+      case EOpDistance:
+      case EOpDot:
+      case EOpCross:
+      case EOpFaceForward:
+      case EOpReflect:
+      case EOpRefract:
         return TIntermConstantUnion::FoldAggregateBuiltIn(op, aggregate, mInfoSink);
       default:
         // Constant folding not supported for the built-in.