commit 95310b000b8e684fa8a85e6cec91bb568a7cfe02
author Olli Etuaho <oetuaho@nvidia.com> Tue Jun 02 17:43:38 2015 +0300
committer Olli Etuaho <oetuaho@nvidia.com> Mon Jun 08 14:57:41 2015 +0000
tree 330e356441dbe720cec0e358bf350a07c3e6226e
parent 2c4b746cbd6a02502a953517e09e312969aed73b

Unify unary operator folding with binary operator folding

Implement unary operator folding in a similar way to binary operator
folding, so that the code is easier to understand.

TEST=dEQP-GLES3.functional.shaders.constant_expressions.*
BUG=angleproject:817

Change-Id: I069bdb38f965e1badb3e8f3f954386b205b7bb00
Reviewed-on: https://chromium-review.googlesource.com/275185
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 5762b1e..915002c 100644
--- a/src/compiler/translator/Intermediate.cpp
+++ b/src/compiler/translator/Intermediate.cpp
@@ -120,10 +120,6 @@
 TIntermTyped *TIntermediate::addUnaryMath(
     TOperator op, TIntermTyped *child, const TSourceLoc &line, const TType *funcReturnType)
 {
-    TIntermConstantUnion *childTempConstant = 0;
-    if (child->getAsConstantUnion())
-        childTempConstant = child->getAsConstantUnion();
-
     //
     // Make a new node for the operator.
     //
@@ -132,13 +128,9 @@
     node->setOperand(child);
     node->promote(funcReturnType);
 
-    if (childTempConstant)
-    {
-        TIntermTyped *newChild = childTempConstant->foldUnary(op, mInfoSink);
-
-        if (newChild)
-            return newChild;
-    }
+    TIntermTyped *foldedNode = node->fold(mInfoSink);
+    if (foldedNode)
+        return foldedNode;
 
     return node;
 }