Constant-qualify nodes in a consistent way

Rely on that constant qualification of binary and unary nodes comes from promote(). BUG=angleproject:1490 TEST=angle_unittests Change-Id: Ie8d1d4df3c82ae5a2de8cc536e47016d13a4fd3d Reviewed-on: https://chromium-review.googlesource.com/377960Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

Constant-qualify nodes in a consistent way
c955058b · Olli Etuaho · Commit Bot · 588e2085 · c955058b
Commit c955058b authored Aug 29, 2016 by Olli Etuaho Committed by Commit Bot Sep 08, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 10 deletions

IntermNode.cpp src/compiler/translator/IntermNode.cpp +4 -10

No files found.
--- a/src/compiler/translator/IntermNode.cpp
+++ b/src/compiler/translator/IntermNode.cpp
@@ -722,7 +722,7 @@ void TIntermBinary::promote()
          case EOpGreaterThan:
          case EOpLessThanEqual:
          case EOpGreaterThanEqual:
-            setType(TType(EbtBool, EbpUndefined));
+            setType(TType(EbtBool, EbpUndefined, resultQualifier));
            break;
          //
@@ -732,7 +732,7 @@ void TIntermBinary::promote()
          case EOpLogicalXor:
          case EOpLogicalOr:
            ASSERT(mLeft->getBasicType() == EbtBool && mRight->getBasicType() == EbtBool);
-            setType(TType(EbtBool, EbpUndefined));
+            setType(TType(EbtBool, EbpUndefined, resultQualifier));
            break;
          default:
@@ -849,12 +849,7 @@ TIntermTyped *TIntermBinary::fold(TDiagnostics *diagnostics)
    TConstantUnion *constArray = leftConstant->foldBinary(mOp, rightConstant, diagnostics);
    // Nodes may be constant folded without being qualified as constant.
-    TQualifier resultQualifier = EvqConst;
+    return CreateFoldedNode(constArray, this, mType.getQualifier());
-    if (mLeft->getQualifier() != EvqConst || mRight->getQualifier() != EvqConst)
-    {
-        resultQualifier = EvqTemporary;
-    }
-    return CreateFoldedNode(constArray, this, resultQualifier);
 }
 TIntermTyped *TIntermUnary::fold(TDiagnostics *diagnostics)
@@ -888,8 +883,7 @@ TIntermTyped *TIntermUnary::fold(TDiagnostics *diagnostics)
    }
    // Nodes may be constant folded without being qualified as constant.
-    TQualifier resultQualifier = mOperand->getQualifier() == EvqConst ? EvqConst : EvqTemporary;
+    return CreateFoldedNode(constArray, this, mType.getQualifier());
-    return CreateFoldedNode(constArray, this, resultQualifier);
 }
 TIntermTyped *TIntermAggregate::fold(TDiagnostics *diagnostics)