commit 7e1200b43cb611a32eda2e28a6c431db65b5aa3a
author Zhenyao Mo <zmo@chromium.org> Tue Jul 05 02:25:13 2016 +0000
committer Zhenyao Mo <zmo@chromium.org> Tue Jul 05 02:25:39 2016 +0000
tree 80617aab0e9801bed07c0f3e6d1fc29e44f105ec
parent ae2e19188cf0a9b035a27143f585df10e72ffabd

Revert "The global invariant pragma must not leak across compilations."

This reverts commit ae2e19188cf0a9b035a27143f585df10e72ffabd.

Change-Id: I017ba4ba9baa633793d7bdd9691c580ed7016cde
Reviewed-on: https://chromium-review.googlesource.com/358410
Reviewed-by: 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 73420d3..3c7742a 100644
--- a/src/compiler/translator/Compiler.cpp
+++ b/src/compiler/translator/Compiler.cpp
@@ -246,7 +246,10 @@
     if (success)
     {
         mPragma = parseContext.pragma();
-        symbolTable.setGlobalInvariant(mPragma.stdgl.invariantAll);
+        if (mPragma.stdgl.invariantAll)
+        {
+            symbolTable.setGlobalInvariant();
+        }
 
         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 a3ca98f..6de7c98 100644
--- a/src/compiler/translator/SymbolTable.h
+++ b/src/compiler/translator/SymbolTable.h
@@ -469,7 +469,8 @@
               mInvariantVaryings.count(originalName) > 0);
     }
 
-    void setGlobalInvariant(bool invariant) { mGlobalInvariant = invariant; }
+    void setGlobalInvariant() { mGlobalInvariant = true; }
+    bool getGlobalInvariant() const { return mGlobalInvariant; }
 
     static int nextUniqueId()
     {