commit d561057f243629474299ee182e0bd86464d41e03
author Olli Etuaho <oetuaho@nvidia.com> Thu Dec 10 19:42:09 2015 +0200
committer Olli Etuaho <oetuaho@nvidia.com> Fri Dec 11 07:33:14 2015 +0000
tree 53ea2a660dfb16cfe9ddcdb0f79443164261b186
parent b0f0b81d5a7851a26d51e3017f713935c2e115e0

Fix ValidateLimitations for folded non-constant expressions

ANGLE recently gained the ability to constant fold some expressions that
are not constant expressions. ValidateLimitations should continue to
recognize all cases where an expression is not a constant expression.

BUG=angleproject:851
TEST=angle_unittests

Change-Id: I8ad0552a59213cdd6af9a220ffd672be9752271d
Reviewed-on: https://chromium-review.googlesource.com/317281
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tryjob-Request: Olli Etuaho <oetuaho@nvidia.com>
Tested-by: Olli Etuaho <oetuaho@nvidia.com>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>

src/compiler/translator/ValidateLimitations.cpp

diff --git a/src/compiler/translator/ValidateLimitations.cpp b/src/compiler/translator/ValidateLimitations.cpp
index ed60c37..4a84fb6 100644
--- a/src/compiler/translator/ValidateLimitations.cpp
+++ b/src/compiler/translator/ValidateLimitations.cpp
@@ -433,8 +433,8 @@
 
 bool ValidateLimitations::isConstExpr(TIntermNode *node)
 {
-    ASSERT(node != NULL);
-    return node->getAsConstantUnion() != NULL;
+    ASSERT(node != nullptr);
+    return node->getAsConstantUnion() != nullptr && node->getAsTyped()->getQualifier() == EvqConst;
 }
 
 bool ValidateLimitations::isConstIndexExpr(TIntermNode *node)