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

Enforce shader input and output variables with a specified location to be single declarations.
0bd18dfb · Jamie Madill · Shannon Woods · 502d66f6 · 0bd18dfb · 0bd18dfb
Commit 0bd18dfb authored Jun 20, 2013 by Jamie Madill Committed by Shannon Woods Jul 19, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 0 deletions

ParseHelper.cpp src/compiler/ParseHelper.cpp +20 -0

ParseHelper.h src/compiler/ParseHelper.h +1 -0

No files found.
--- a/src/compiler/ParseHelper.cpp
+++ b/src/compiler/ParseHelper.cpp
@@ -649,6 +649,17 @@ bool TParseContext::structQualifierErrorCheck(int line, const TPublicType& pType
    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 @@ TIntermAggregate* TParseContext::parseDeclarator(TPublicType &publicType, TInter
    if (structQualifierErrorCheck(identifierLocation, publicType))
        recover();

+    if (locationDeclaratorListCheck(identifierLocation, publicType))
+        recover();
+
    if (nonInitConstErrorCheck(identifierLocation, identifier, publicType, false))
        recover();

@@ -1339,6 +1353,9 @@ TIntermAggregate* TParseContext::parseArrayDeclarator(TPublicType &publicType, T
    if (structQualifierErrorCheck(identifierLocation, publicType))
        recover();

+    if (locationDeclaratorListCheck(identifierLocation, publicType))
+        recover();
+
    if (nonInitConstErrorCheck(identifierLocation, identifier, publicType, true))
        recover();

@@ -1378,6 +1395,9 @@ TIntermAggregate* TParseContext::parseInitDeclarator(TPublicType &publicType, TI
    if (structQualifierErrorCheck(identifierLocation, publicType))
        recover();

+    if (locationDeclaratorListCheck(identifierLocation, publicType))
+        recover();
+
    TIntermNode* intermNode;
    if (!executeInitializer(identifierLocation, identifier, publicType, initializer, intermNode))
    {

--- a/src/compiler/ParseHelper.h
+++ b/src/compiler/ParseHelper.h
@@ -95,6 +95,7 @@ struct TParseContext {
    bool boolErrorCheck(int, const TPublicType&);
    bool samplerErrorCheck(int line, const TPublicType& pType, const char* reason);
    bool structQualifierErrorCheck(int line, const TPublicType& pType);
+    bool locationDeclaratorListCheck(int line, const TPublicType &pType);
    bool parameterSamplerErrorCheck(int line, TQualifier qualifier, const TType& type);
    bool nonInitConstErrorCheck(int line, const TString& identifier, TPublicType& type, bool array);
    bool nonInitErrorCheck(int line, const TString& identifier, const TPublicType& type, TVariable*& variable);