commit ae2e19188cf0a9b035a27143f585df10e72ffabd
author Kenneth Russell <kbr@chromium.org> Fri Jul 01 19:52:52 2016 -0700
committer Zhenyao Mo <zmo@chromium.org> Tue Jul 05 02:24:25 2016 +0000
tree 3648246f8b4e0bd46d91375a07158aebc35b1bdd
parent 6e4cfceb80110f24d7986a7bbd2015b4b616fb4d

The global invariant pragma must not leak across compilations.

BUG=chromium:625363
TEST=conformance/glsl/bugs/global-invariant-does-not-leak-across-shaders.html

Change-Id: Ie8d38e44837fc87bb4c94e76e779ad41e8b79957
Reviewed-on: https://chromium-review.googlesource.com/358203
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Zhenyao Mo <zmo@chromium.org>

src/compiler/translator/Compiler.cpp

diff --git a/src/compiler/translator/Compiler.cpp b/src/compiler/translator/Compiler.cpp
index 3c7742a..73420d3 100644
--- a/src/compiler/translator/Compiler.cpp
+++ b/src/compiler/translator/Compiler.cpp
@@ -246,10 +246,7 @@
     if (success)
     {
         mPragma = parseContext.pragma();
-        if (mPragma.stdgl.invariantAll)
-        {
-            symbolTable.setGlobalInvariant();
-        }
+        symbolTable.setGlobalInvariant(mPragma.stdgl.invariantAll);
 
         root = parseContext.getTreeRoot();
         root = intermediate.postProcess(root);

src/compiler/translator/SymbolTable.h

diff --git a/src/compiler/translator/SymbolTable.h b/src/compiler/translator/SymbolTable.h
index 6de7c98..a3ca98f 100644
--- a/src/compiler/translator/SymbolTable.h
+++ b/src/compiler/translator/SymbolTable.h
@@ -469,8 +469,7 @@
               mInvariantVaryings.count(originalName) > 0);
     }
 
-    void setGlobalInvariant() { mGlobalInvariant = true; }
-    bool getGlobalInvariant() const { return mGlobalInvariant; }
+    void setGlobalInvariant(bool invariant) { mGlobalInvariant = invariant; }
 
     static int nextUniqueId()
     {