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/275185Reviewed-by: Zhenyao Mo <zmo@chromium.org> Tested-by: Olli Etuaho <oetuaho@nvidia.com>

Unify unary operator folding with binary operator folding
95310b00 · Olli Etuaho · 2c4b746c · 95310b00 · 95310b00 · 95310b00
Commit 95310b00 authored Jun 02, 2015 by Olli Etuaho
Showing with 5 additions and 12 deletions

IntermNode.cpp src/compiler/translator/IntermNode.cpp +0 -0

IntermNode.h src/compiler/translator/IntermNode.h +2 -1

Intermediate.cpp src/compiler/translator/Intermediate.cpp +3 -11

No files found.
--- a/src/compiler/translator/IntermNode.cpp
+++ b/src/compiler/translator/IntermNode.cpp
--- a/src/compiler/translator/IntermNode.h
+++ b/src/compiler/translator/IntermNode.h
@@ -300,7 +300,7 @@ class TIntermConstantUnion : public TIntermTyped
    virtual bool replaceChildNode(TIntermNode *, TIntermNode *) { return false; }
    TConstantUnion *foldBinary(TOperator op, TIntermConstantUnion *rightNode, TInfoSink &infoSink);
-    TIntermTyped *foldUnary(TOperator op, TInfoSink &infoSink);
+    TConstantUnion *foldUnary(TOperator op, TInfoSink &infoSink);
    static TIntermTyped *FoldAggregateBuiltIn(TOperator op, TIntermAggregate *aggregate, TInfoSink &infoSink);
@@ -404,6 +404,7 @@ class TIntermUnary : public TIntermOperator
    void setOperand(TIntermTyped *operand) { mOperand = operand; }
    TIntermTyped *getOperand() { return mOperand; }
    void promote(const TType *funcReturnType);
+    TIntermTyped *fold(TInfoSink &infoSink);
    void setUseEmulatedFunction() { mUseEmulatedFunction = true; }
    bool getUseEmulatedFunction() { return mUseEmulatedFunction; }

--- a/src/compiler/translator/Intermediate.cpp
+++ b/src/compiler/translator/Intermediate.cpp
@@ -120,10 +120,6 @@ TIntermTyped *TIntermediate::addIndex(
 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 @@ TIntermTyped *TIntermediate::addUnaryMath(
    node->setOperand(child);
    node->promote(funcReturnType);
-    if (childTempConstant)
+    TIntermTyped *foldedNode = node->fold(mInfoSink);
-    {
+    if (foldedNode)
-        TIntermTyped *newChild = childTempConstant->foldUnary(op, mInfoSink);
+        return foldedNode;
-        if (newChild)
-            return newChild;
-    }
    return node;
 }