commit 1c28e1f069264b8702db779ace2b9a1c727f00fd
author Jamie Madill <jmadill@chromium.org> Mon Aug 04 11:37:54 2014 -0400
committer Jamie Madill <jmadill@chromium.org> Mon Aug 04 15:44:59 2014 +0000
tree 07ee9647238f842bb0490128771ae7e547de7267
parent f4e39bfdcb6a9eeff9a94de81eafb31a158356f7

Fix shaders with invariant keyword.

We would trigger assertion failures in Debug mode, and fail to
parse and translate correctly in Release.

BUG=angle:711

Change-Id: Ibb7f33b288376617598578f48c7bbdbdec044279
Reviewed-on: https://chromium-review.googlesource.com/210822
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Nicolas Capens <capn@chromium.org>

src/compiler/translator/VariableInfo.cpp

diff --git a/src/compiler/translator/VariableInfo.cpp b/src/compiler/translator/VariableInfo.cpp
index 153455c..0bd95cb 100644
--- a/src/compiler/translator/VariableInfo.cpp
+++ b/src/compiler/translator/VariableInfo.cpp
@@ -320,6 +320,8 @@
       case EOpDeclaration:
         {
             const TIntermSequence &sequence = *(node->getSequence());
+            ASSERT(!sequence.empty());
+
             const TIntermTyped &typedNode = *(sequence.front()->getAsTyped());
             TQualifier qualifier = typedNode.getQualifier();
 
@@ -344,14 +346,16 @@
                     visitInfoList(sequence, mUniforms);
                     break;
                   default:
-                    visitInfoList(sequence, mVaryings);
+                    // do not traverse invariant declarations such as
+                    //  "invariant gl_Position;"
+                    if (typedNode.getBasicType() != EbtInvariant)
+                    {
+                        visitInfoList(sequence, mVaryings);
+                    }
                     break;
                 }
 
-                if (!sequence.empty())
-                {
-                    visitChildren = false;
-                }
+                visitChildren = false;
             }
             break;
         }