commit 51a53c7bc2f2fe277dcff8007f88cbb2a39ceadc
author Jamie Madill <jmadill@transgaming.com> Wed Jun 19 09:24:43 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:04:56 2013 -0400
tree c3b6d139e25fdcf9a0432ece30e56202f76ebcd2
parent fd39655df035e8a5f7c6feaa97e950cde85a84ae

Properly report error when layout qualifiers are specified outside uniform blocks.

TRAC #23357

Signed-off-by: Shannon Woods
Signed-off-by: Geoff Lang
Authored-by: Jamie Madill

src/compiler/ParseHelper.cpp

diff --git a/src/compiler/ParseHelper.cpp b/src/compiler/ParseHelper.cpp
index 25106ec..a30bd27 100644
--- a/src/compiler/ParseHelper.cpp
+++ b/src/compiler/ParseHelper.cpp
@@ -976,18 +976,18 @@
     if (layoutQualifier.matrixPacking != EmpUnspecified)
     {
         error(identifierLocation, "layout qualifier", getMatrixPackingString(layoutQualifier.matrixPacking), "only valid for interface blocks");
-        return false;
+        return true;
     }
 
     if (layoutQualifier.blockStorage != EbsUnspecified)
     {
         error(identifierLocation, "layout qualifier", getBlockStorageString(layoutQualifier.blockStorage), "only valid for interface blocks");
-        return false;
+        return true;
     }
 
     if (publicType.qualifier != EvqVertexInput && publicType.qualifier != EvqFragmentOutput && layoutLocationErrorCheck(identifierLocation, publicType.layoutQualifier))
     {
-        return false;
+        return true;
     }
 
     return false;
@@ -1226,7 +1226,7 @@
 
     if (identifier != "")
     {
-        if (structQualifierErrorCheck(identifierLocation, publicType))
+        if (singleDeclarationErrorCheck(publicType, identifierLocation, identifier))
             recover();
 
         // this error check can mutate the type
@@ -1249,7 +1249,7 @@
 
 TIntermAggregate* TParseContext::parseSingleArrayDeclaration(TPublicType &publicType, TSourceLoc identifierLocation, const TString &identifier, TSourceLoc indexLocation, TIntermTyped *indexExpression)
 {
-    if (structQualifierErrorCheck(identifierLocation, publicType))
+    if (singleDeclarationErrorCheck(publicType, identifierLocation, identifier))
         recover();
 
     // this error check can mutate the type