Add 3D samplers to the lexer/parser.

src/compiler/glslang.l

@@ -155,8 +155,10 @@ O           [0-7]
 "sampler2DShadow"    { return ES2_reserved_ES3_keyword(context, SAMPLER2DSHADOW); }
 "sampler2DRect"      { return SAMPLER2DRECT; }
 "isampler2D"         { return ES2_ident_ES3_keyword(context, ISAMPLER2D); }
+"isampler3D"         { return ES2_ident_ES3_keyword(context, ISAMPLER3D); }
 "isamplerCube"       { return ES2_ident_ES3_keyword(context, ISAMPLERCUBE); }
 "usampler2D"         { return ES2_ident_ES3_keyword(context, USAMPLER2D); }
+"usampler3D"         { return ES2_ident_ES3_keyword(context, USAMPLER3D); }
 "usamplerCube"       { return ES2_ident_ES3_keyword(context, USAMPLERCUBE); }
 
 "struct"       { return STRUCT; }

src/compiler/glslang.y

@@ -131,7 +131,8 @@ extern void yyerror(TParseContext* context, const char* reason);
 %token <lex> MATRIX2x3 MATRIX3x2 MATRIX2x4 MATRIX4x2 MATRIX3x4 MATRIX4x3
 %token <lex> CENTROID FLAT SMOOTH
 %token <lex> STRUCT VOID_TYPE WHILE
-%token <lex> SAMPLER2D SAMPLERCUBE SAMPLER_EXTERNAL_OES SAMPLER2DRECT ISAMPLER2D ISAMPLERCUBE  USAMPLER2D USAMPLERCUBE
+%token <lex> SAMPLER2D SAMPLERCUBE SAMPLER_EXTERNAL_OES SAMPLER2DRECT
+%token <lex> ISAMPLER2D ISAMPLER3D ISAMPLERCUBE USAMPLER2D USAMPLER3D USAMPLERCUBE
 %token <lex> SAMPLER3D SAMPLER3DRECT SAMPLER2DSHADOW
 %token <lex> LAYOUT
 
@@ -1509,6 +1510,10 @@ type_specifier_nonarray
         TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
         $$.setBasic(EbtSampler2D, qual, $1.line);
     }
+    | SAMPLER3D {
+        TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
+        $$.setBasic(EbtSampler3D, qual, $1.line);
+    }
     | SAMPLERCUBE {
         FRAG_VERT_ONLY("samplerCube", $1.line);
         TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
@@ -1518,6 +1523,10 @@ type_specifier_nonarray
         TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
         $$.setBasic(EbtISampler2D, qual, $1.line);
     }
+    | ISAMPLER3D {
+        TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
+        $$.setBasic(EbtISampler3D, qual, $1.line);
+    }
     | ISAMPLERCUBE {
         TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
         $$.setBasic(EbtISamplerCube, qual, $1.line);
@@ -1526,6 +1535,10 @@ type_specifier_nonarray
         TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
         $$.setBasic(EbtUSampler2D, qual, $1.line);
     }
+    | USAMPLER3D {
+        TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
+        $$.setBasic(EbtUSampler3D, qual, $1.line);
+    }
     | USAMPLERCUBE {
         TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
         $$.setBasic(EbtUSamplerCube, qual, $1.line);

src/compiler/glslang_tab.h

@@ -105,65 +105,67 @@ extern int yydebug;
      SAMPLER_EXTERNAL_OES = 314,
      SAMPLER2DRECT = 315,
      ISAMPLER2D = 316,
-     ISAMPLERCUBE = 317,
-     USAMPLER2D = 318,
-     USAMPLERCUBE = 319,
-     SAMPLER3D = 320,
-     SAMPLER3DRECT = 321,
-     SAMPLER2DSHADOW = 322,
-     LAYOUT = 323,
-     IDENTIFIER = 324,
-     TYPE_NAME = 325,
-     FLOATCONSTANT = 326,
-     INTCONSTANT = 327,
-     UINTCONSTANT = 328,
-     BOOLCONSTANT = 329,
-     FIELD_SELECTION = 330,
-     LEFT_OP = 331,
-     RIGHT_OP = 332,
-     INC_OP = 333,
-     DEC_OP = 334,
-     LE_OP = 335,
-     GE_OP = 336,
-     EQ_OP = 337,
-     NE_OP = 338,
-     AND_OP = 339,
-     OR_OP = 340,
-     XOR_OP = 341,
-     MUL_ASSIGN = 342,
-     DIV_ASSIGN = 343,
-     ADD_ASSIGN = 344,
-     MOD_ASSIGN = 345,
-     LEFT_ASSIGN = 346,
-     RIGHT_ASSIGN = 347,
-     AND_ASSIGN = 348,
-     XOR_ASSIGN = 349,
-     OR_ASSIGN = 350,
-     SUB_ASSIGN = 351,
-     LEFT_PAREN = 352,
-     RIGHT_PAREN = 353,
-     LEFT_BRACKET = 354,
-     RIGHT_BRACKET = 355,
-     LEFT_BRACE = 356,
-     RIGHT_BRACE = 357,
-     DOT = 358,
-     COMMA = 359,
-     COLON = 360,
-     EQUAL = 361,
-     SEMICOLON = 362,
-     BANG = 363,
-     DASH = 364,
-     TILDE = 365,
-     PLUS = 366,
-     STAR = 367,
-     SLASH = 368,
-     PERCENT = 369,
-     LEFT_ANGLE = 370,
-     RIGHT_ANGLE = 371,
-     VERTICAL_BAR = 372,
-     CARET = 373,
-     AMPERSAND = 374,
-     QUESTION = 375
+     ISAMPLER3D = 317,
+     ISAMPLERCUBE = 318,
+     USAMPLER2D = 319,
+     USAMPLER3D = 320,
+     USAMPLERCUBE = 321,
+     SAMPLER3D = 322,
+     SAMPLER3DRECT = 323,
+     SAMPLER2DSHADOW = 324,
+     LAYOUT = 325,
+     IDENTIFIER = 326,
+     TYPE_NAME = 327,
+     FLOATCONSTANT = 328,
+     INTCONSTANT = 329,
+     UINTCONSTANT = 330,
+     BOOLCONSTANT = 331,
+     FIELD_SELECTION = 332,
+     LEFT_OP = 333,
+     RIGHT_OP = 334,
+     INC_OP = 335,
+     DEC_OP = 336,
+     LE_OP = 337,
+     GE_OP = 338,
+     EQ_OP = 339,
+     NE_OP = 340,
+     AND_OP = 341,
+     OR_OP = 342,
+     XOR_OP = 343,
+     MUL_ASSIGN = 344,
+     DIV_ASSIGN = 345,
+     ADD_ASSIGN = 346,
+     MOD_ASSIGN = 347,
+     LEFT_ASSIGN = 348,
+     RIGHT_ASSIGN = 349,
+     AND_ASSIGN = 350,
+     XOR_ASSIGN = 351,
+     OR_ASSIGN = 352,
+     SUB_ASSIGN = 353,
+     LEFT_PAREN = 354,
+     RIGHT_PAREN = 355,
+     LEFT_BRACKET = 356,
+     RIGHT_BRACKET = 357,
+     LEFT_BRACE = 358,
+     RIGHT_BRACE = 359,
+     DOT = 360,
+     COMMA = 361,
+     COLON = 362,
+     EQUAL = 363,
+     SEMICOLON = 364,
+     BANG = 365,
+     DASH = 366,
+     TILDE = 367,
+     PLUS = 368,
+     STAR = 369,
+     SLASH = 370,
+     PERCENT = 371,
+     LEFT_ANGLE = 372,
+     RIGHT_ANGLE = 373,
+     VERTICAL_BAR = 374,
+     CARET = 375,
+     AMPERSAND = 376,
+     QUESTION = 377
    };
 #endif