Add partial support for parsing layout qualifiers, added in the GLES SL 3.00 spec.

src/compiler/BaseTypes.h

@@ -131,6 +131,26 @@ enum TQualifier
     EvqLast
 };
 
+// Layout qualifiers
+enum TLayoutQualifierType
+{
+    ElqLocation,
+    ElqShared,
+    ElqPacked,
+    ElqStd140,
+    ElqRowMajor,
+    ElqColumnMajor,
+    ElqError
+};
+
+struct TLayoutQualifierId
+{
+    TLayoutQualifierType type;
+    int location;
+};
+
+typedef std::vector<TLayoutQualifierId> TLayoutQualifier;
+
 //
 // This is just for debug print out, carried along with the definitions above.
 //

src/compiler/ParseHelper.cpp

@@ -2081,6 +2081,87 @@ TIntermTyped* TParseContext::addFieldSelectionExpression(TIntermTyped *baseExpre
     return indexedExpression;
 }
 
+TLayoutQualifierId TParseContext::addLayoutQualifierId(const TString &qualifierType, TSourceLoc qualifierTypeLine)
+{
+    TLayoutQualifierId qualifierId;
+
+    qualifierId.type = ElqError;
+    qualifierId.location = -1;
+
+    if (qualifierType == "shared")
+    {
+        qualifierId.type = ElqShared;
+    }
+    else if (qualifierType == "packed")
+    {
+        qualifierId.type = ElqPacked;
+    }
+    else if (qualifierType == "std140")
+    {
+        qualifierId.type = ElqStd140;
+    }
+    else if (qualifierType == "row_major")
+    {
+        qualifierId.type = ElqRowMajor;
+    }
+    else if (qualifierType == "column_major")
+    {
+        qualifierId.type = ElqColumnMajor;
+    }
+    else if (qualifierType == "location")
+    {
+        error(qualifierTypeLine, "invalid layout qualifier", qualifierType.c_str(), "location requires an argument");
+        recover();
+    }
+    else
+    {
+        error(qualifierTypeLine, "invalid layout qualifier", qualifierType.c_str());
+        recover();
+    }
+
+    return qualifierId;
+}
+
+TLayoutQualifierId TParseContext::addLayoutQualifierId(const TString &qualifierType, TSourceLoc qualifierTypeLine, const TString &intValueString, int intValue, TSourceLoc intValueLine)
+{
+    TLayoutQualifierId qualifierId;
+
+    qualifierId.type = ElqError;
+    qualifierId.location = -1;
+
+    if (qualifierType != "location")
+    {
+        error(qualifierTypeLine, "invalid layout qualifier", qualifierType.c_str(), "only location may have arguments");
+        recover();
+    }
+    else
+    {
+        if (intValue < 0)
+        {
+            error(intValueLine, "out of range", intValueString.c_str(), "value must be non-negative and < MAX_DRAW_BUFFERS");
+            recover();
+        }
+        else
+        {
+            qualifierId.location = intValue;
+        }
+
+        // TODO: must check that location is < MAX_DRAW_BUFFERS
+    }
+
+    return qualifierId;
+}
+
+TLayoutQualifier* TParseContext::makeLayoutQualifierFromId(TLayoutQualifierId layoutQualifierId)
+{
+    return NULL;
+}
+
+TLayoutQualifier* TParseContext::extendLayoutQualifier(TLayoutQualifier *layoutQualifier, TLayoutQualifierId layoutQualifierId)
+{
+    return NULL;
+}
+
 TTypeList *TParseContext::addStructDeclaratorList(const TPublicType& typeSpecifier, TTypeList *typeList)
 {
     if (voidErrorCheck(typeSpecifier.line, (*typeList)[0].type->getFieldName(), typeSpecifier)) {

src/compiler/ParseHelper.h

@@ -139,6 +139,11 @@ struct TParseContext {
     TIntermAggregate* addInterfaceBlock(const TPublicType& typeQualifier, TSourceLoc nameLine, const TString& blockName, TTypeList* typeList, 
                                         const TString& instanceName, TSourceLoc instanceLine, TIntermTyped* arrayIndex, TSourceLoc arrayIndexLine);
 
+    TLayoutQualifierId addLayoutQualifierId(const TString &qualifierType, TSourceLoc qualifierTypeLine);
+    TLayoutQualifierId addLayoutQualifierId(const TString &qualifierType, TSourceLoc qualifierTypeLine, const TString &intValueString, int intValue, TSourceLoc intValueLine);
+    TLayoutQualifier* makeLayoutQualifierFromId(TLayoutQualifierId layoutQualifierId);
+    TLayoutQualifier* extendLayoutQualifier(TLayoutQualifier *layoutQualifier, TLayoutQualifierId layoutQualifierId);
+
     // Performs an error check for embedded struct declarations.
     // Returns true if an error was raised due to the declaration of
     // this struct.

src/compiler/Types.h

@@ -337,6 +337,7 @@ protected:
 struct TPublicType
 {
     TBasicType type;
+    TLayoutQualifier* layoutQualifier;
     TQualifier qualifier;
     TPrecision precision;
     int primarySize;          // size of vector or cols of matrix
@@ -349,6 +350,7 @@ struct TPublicType
     void setBasic(TBasicType bt, TQualifier q, int ln = 0)
     {
         type = bt;
+        layoutQualifier = NULL;
         qualifier = q;
         precision = EbpUndefined;
         primarySize = 1;

src/compiler/glslang.l

@@ -167,6 +167,8 @@ O           [0-7]
 
 "struct"       { context->lexAfterType = true; return(STRUCT); }
 
+"layout"  { return ES2_ident_ES3_keyword(context, LAYOUT); }
+
     /* Reserved keywords for GLSL ES 3.00 that are not reserved for GLSL ES 1.00 */
 "coherent"          |
 "restrict"          |
@@ -233,6 +235,17 @@ O           [0-7]
 	return reserved_word(yyscanner);
 }
 
+    /* Reserved keywords in GLSL ES 1.00 that are not reserved in GLSL ES 3.00 */
+"packed"  {
+    if (context->shaderVersion >= 300)
+    {
+        yylval->lex.string = NewPoolTString(yytext);
+        return check_type(yyscanner);
+    }
+
+    return reserved_word(yyscanner);
+}
+
     /* Reserved keywords */
 "asm"          |
 
@@ -242,7 +255,6 @@ O           [0-7]
 "typedef"      |
 "template"     |
 "this"         |
-"packed"       |
 
 "goto"         |
 

src/compiler/glslang.y

@@ -72,6 +72,8 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h).
         union {
             TPublicType type;
             TPrecision precision;
+            TLayoutQualifierId layoutQualifierId;
+            TLayoutQualifier* layoutQualifier;
             TQualifier qualifier;
             TFunction* function;
             TParameter param;
@@ -132,6 +134,7 @@ extern void yyerror(TParseContext* context, const char* reason);
 %token <lex> STRUCT VOID_TYPE WHILE
 %token <lex> SAMPLER2D SAMPLERCUBE SAMPLER_EXTERNAL_OES SAMPLER2DRECT
 %token <lex> SAMPLER3D SAMPLER3DRECT SAMPLER2DSHADOW
+%token <lex> LAYOUT
 
 %token <lex> IDENTIFIER TYPE_NAME FLOATCONSTANT INTCONSTANT UINTCONSTANT BOOLCONSTANT
 %token <lex> FIELD_SELECTION
@@ -167,6 +170,8 @@ extern void yyerror(TParseContext* context, const char* reason);
 
 %type <interm> parameter_declaration parameter_declarator parameter_type_specifier
 %type <interm.qualifier> parameter_qualifier parameter_type_qualifier 
+%type <interm.layoutQualifier> layout_qualifier layout_qualifier_id_list
+%type <interm.layoutQualifierId> layout_qualifier_id
 
 %type <interm.precision> precision_qualifier
 %type <interm.type> type_qualifier fully_specified_type type_specifier storage_qualifier interpolation_qualifier
@@ -1369,6 +1374,14 @@ type_qualifier
         TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
         $$.setBasic(EbtVoid, qual, $1.line);
     }
+    | layout_qualifier {
+        $$.qualifier = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
+        $$.layoutQualifier = $1;
+    }
+    | layout_qualifier storage_qualifier {
+        $$.setBasic(EbtVoid, $2.qualifier, $2.line);
+        $$.layoutQualifier = $1;
+    }
     ;
 
 storage_qualifier
@@ -1433,6 +1446,34 @@ precision_qualifier
     }
     ;
 
+layout_qualifier
+    : LAYOUT LEFT_PAREN layout_qualifier_id_list RIGHT_PAREN {
+        ES3_ONLY("layout", $1.line, "qualifier");
+        $$ = $3;
+    }
+    ;
+
+layout_qualifier_id_list
+    : layout_qualifier_id {
+        $$ = context->makeLayoutQualifierFromId($1);
+    }
+    | layout_qualifier_id_list COMMA layout_qualifier_id {
+        $$ = context->extendLayoutQualifier($1, $3);
+    }
+    ;
+
+layout_qualifier_id
+    : IDENTIFIER {
+        $$ = context->addLayoutQualifierId(*$1.string, $1.line);
+    }
+    | IDENTIFIER EQUAL INTCONSTANT {
+        $$ = context->addLayoutQualifierId(*$1.string, $1.line, *$3.string, $3.i, $3.line);
+    }
+    | IDENTIFIER EQUAL UINTCONSTANT {
+        $$ = context->addLayoutQualifierId(*$1.string, $1.line, *$3.string, $3.i, $3.line);
+    }
+    ;
+
 type_specifier_no_prec
     : type_specifier_nonarray {
         $$ = $1;

src/compiler/glslang_tab.h

@@ -107,58 +107,59 @@ extern int yydebug;
      SAMPLER3D = 316,
      SAMPLER3DRECT = 317,
      SAMPLER2DSHADOW = 318,
-     IDENTIFIER = 319,
-     TYPE_NAME = 320,
-     FLOATCONSTANT = 321,
-     INTCONSTANT = 322,
-     UINTCONSTANT = 323,
-     BOOLCONSTANT = 324,
-     FIELD_SELECTION = 325,
-     LEFT_OP = 326,
-     RIGHT_OP = 327,
-     INC_OP = 328,
-     DEC_OP = 329,
-     LE_OP = 330,
-     GE_OP = 331,
-     EQ_OP = 332,
-     NE_OP = 333,
-     AND_OP = 334,
-     OR_OP = 335,
-     XOR_OP = 336,
-     MUL_ASSIGN = 337,
-     DIV_ASSIGN = 338,
-     ADD_ASSIGN = 339,
-     MOD_ASSIGN = 340,
-     LEFT_ASSIGN = 341,
-     RIGHT_ASSIGN = 342,
-     AND_ASSIGN = 343,
-     XOR_ASSIGN = 344,
-     OR_ASSIGN = 345,
-     SUB_ASSIGN = 346,
-     LEFT_PAREN = 347,
-     RIGHT_PAREN = 348,
-     LEFT_BRACKET = 349,
-     RIGHT_BRACKET = 350,
-     LEFT_BRACE = 351,
-     RIGHT_BRACE = 352,
-     DOT = 353,
-     COMMA = 354,
-     COLON = 355,
-     EQUAL = 356,
-     SEMICOLON = 357,
-     BANG = 358,
-     DASH = 359,
-     TILDE = 360,
-     PLUS = 361,
-     STAR = 362,
-     SLASH = 363,
-     PERCENT = 364,
-     LEFT_ANGLE = 365,
-     RIGHT_ANGLE = 366,
-     VERTICAL_BAR = 367,
-     CARET = 368,
-     AMPERSAND = 369,
-     QUESTION = 370
+     LAYOUT = 319,
+     IDENTIFIER = 320,
+     TYPE_NAME = 321,
+     FLOATCONSTANT = 322,
+     INTCONSTANT = 323,
+     UINTCONSTANT = 324,
+     BOOLCONSTANT = 325,
+     FIELD_SELECTION = 326,
+     LEFT_OP = 327,
+     RIGHT_OP = 328,
+     INC_OP = 329,
+     DEC_OP = 330,
+     LE_OP = 331,
+     GE_OP = 332,
+     EQ_OP = 333,
+     NE_OP = 334,
+     AND_OP = 335,
+     OR_OP = 336,
+     XOR_OP = 337,
+     MUL_ASSIGN = 338,
+     DIV_ASSIGN = 339,
+     ADD_ASSIGN = 340,
+     MOD_ASSIGN = 341,
+     LEFT_ASSIGN = 342,
+     RIGHT_ASSIGN = 343,
+     AND_ASSIGN = 344,
+     XOR_ASSIGN = 345,
+     OR_ASSIGN = 346,
+     SUB_ASSIGN = 347,
+     LEFT_PAREN = 348,
+     RIGHT_PAREN = 349,
+     LEFT_BRACKET = 350,
+     RIGHT_BRACKET = 351,
+     LEFT_BRACE = 352,
+     RIGHT_BRACE = 353,
+     DOT = 354,
+     COMMA = 355,
+     COLON = 356,
+     EQUAL = 357,
+     SEMICOLON = 358,
+     BANG = 359,
+     DASH = 360,
+     TILDE = 361,
+     PLUS = 362,
+     STAR = 363,
+     SLASH = 364,
+     PERCENT = 365,
+     LEFT_ANGLE = 366,
+     RIGHT_ANGLE = 367,
+     VERTICAL_BAR = 368,
+     CARET = 369,
+     AMPERSAND = 370,
+     QUESTION = 371
    };
 #endif
 
@@ -191,6 +192,8 @@ typedef union YYSTYPE
         union {
             TPublicType type;
             TPrecision precision;
+            TLayoutQualifierId layoutQualifierId;
+            TLayoutQualifier* layoutQualifier;
             TQualifier qualifier;
             TFunction* function;
             TParameter param;