commit 0bd18dfb1a21be7e0ddccf983dcbf82baa6b3729
author Jamie Madill <jmadill@transgaming.com> Thu Jun 20 11:55:52 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:05:04 2013 -0400
tree 456914d2085f7842a65d1a5f5dea0e3e12cc9bf8
parent 502d66f6f6a67350a66608ef337d9d884862bd19

Enforce shader input and output variables with a specified location to be single declarations.

This prevents using in and out qualifiers on multiply declared vertex inputs and fragment outputs.

TRAC #23311

Signed-off-by: Nicolas Capens
Signed-off-by: Shannon Woods
Authored-by: Jamie Madill

src/compiler/ParseHelper.cpp

diff --git a/src/compiler/ParseHelper.cpp b/src/compiler/ParseHelper.cpp
index 7f61665..4de4509 100644
--- a/src/compiler/ParseHelper.cpp
+++ b/src/compiler/ParseHelper.cpp
@@ -649,6 +649,17 @@
     return false;
 }
 
+bool TParseContext::locationDeclaratorListCheck(int line, const TPublicType &pType)
+{
+    if (pType.layoutQualifier.location != -1)
+    {
+        error(line, "location must only be specified for a single input or output variable", "location");
+        return true;
+    }
+
+    return false;
+}
+
 bool TParseContext::parameterSamplerErrorCheck(int line, TQualifier qualifier, const TType& type)
 {
     if ((qualifier == EvqOut || qualifier == EvqInOut) && 
@@ -1322,6 +1333,9 @@
     if (structQualifierErrorCheck(identifierLocation, publicType))
         recover();
 
+    if (locationDeclaratorListCheck(identifierLocation, publicType))
+        recover();
+
     if (nonInitConstErrorCheck(identifierLocation, identifier, publicType, false))
         recover();
 
@@ -1339,6 +1353,9 @@
     if (structQualifierErrorCheck(identifierLocation, publicType))
         recover();
 
+    if (locationDeclaratorListCheck(identifierLocation, publicType))
+        recover();
+
     if (nonInitConstErrorCheck(identifierLocation, identifier, publicType, true))
         recover();
 
@@ -1378,6 +1395,9 @@
     if (structQualifierErrorCheck(identifierLocation, publicType))
         recover();
 
+    if (locationDeclaratorListCheck(identifierLocation, publicType))
+        recover();
+
     TIntermNode* intermNode;
     if (!executeInitializer(identifierLocation, identifier, publicType, initializer, intermNode))
     {