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: I66389352b92211f4d7967772f68470c8e93405bd Reviewed-on: https://chromium-review.googlesource.com/358515Reviewed-by: Zhenyao Mo <zmo@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Kenneth Russell <kbr@chromium.org>

The global invariant pragma must not leak across compilations.
8bad46d4 · Kenneth Russell · Commit Bot · 61b81acf · 8bad46d4 · 8bad46d4
Commit 8bad46d4 authored Jul 01, 2016 by Kenneth Russell Committed by Commit Bot Jul 07, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

Compiler.cpp src/compiler/translator/Compiler.cpp +1 -4

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

No files found.
--- a/src/compiler/translator/Compiler.cpp
+++ b/src/compiler/translator/Compiler.cpp
@@ -246,10 +246,7 @@ TIntermNode *TCompiler::compileTreeImpl(const char *const shaderStrings[],
    if (success)
    {
        mPragma = parseContext.pragma();
-        if (mPragma.stdgl.invariantAll)
+        symbolTable.setGlobalInvariant(mPragma.stdgl.invariantAll);
-        {
-            symbolTable.setGlobalInvariant();
-        }
        root = parseContext.getTreeRoot();
        root = intermediate.postProcess(root);

--- a/src/compiler/translator/SymbolTable.h
+++ b/src/compiler/translator/SymbolTable.h
@@ -469,8 +469,7 @@ class TSymbolTable : angle::NonCopyable
              mInvariantVaryings.count(originalName) > 0);
    }
-    void setGlobalInvariant() { mGlobalInvariant = true; }
+    void setGlobalInvariant(bool invariant) { mGlobalInvariant = invariant; }
-    bool getGlobalInvariant() const { return mGlobalInvariant; }
    static int nextUniqueId()
    {