Roll back to ANGLE/2845

1 files changed, 136 insertions, 158 deletions

diff --git a/gfx/angle/src/compiler/translator/glslang_tab.h b/gfx/angle/src/compiler/translator/glslang_tab.h
index 8b043c01d..7331594a4 100755
--- a/gfx/angle/src/compiler/translator/glslang_tab.h
+++ b/gfx/angle/src/compiler/translator/glslang_tab.h
@@ -50,151 +50,134 @@ extern int yydebug;
 /* Token type.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-enum yytokentype
-{
-    INVARIANT            = 258,
-    HIGH_PRECISION       = 259,
-    MEDIUM_PRECISION     = 260,
-    LOW_PRECISION        = 261,
-    PRECISION            = 262,
-    ATTRIBUTE            = 263,
-    CONST_QUAL           = 264,
-    BOOL_TYPE            = 265,
-    FLOAT_TYPE           = 266,
-    INT_TYPE             = 267,
-    UINT_TYPE            = 268,
-    BREAK                = 269,
-    CONTINUE             = 270,
-    DO                   = 271,
-    ELSE                 = 272,
-    FOR                  = 273,
-    IF                   = 274,
-    DISCARD              = 275,
-    RETURN               = 276,
-    SWITCH               = 277,
-    CASE                 = 278,
-    DEFAULT              = 279,
-    BVEC2                = 280,
-    BVEC3                = 281,
-    BVEC4                = 282,
-    IVEC2                = 283,
-    IVEC3                = 284,
-    IVEC4                = 285,
-    VEC2                 = 286,
-    VEC3                 = 287,
-    VEC4                 = 288,
-    UVEC2                = 289,
-    UVEC3                = 290,
-    UVEC4                = 291,
-    MATRIX2              = 292,
-    MATRIX3              = 293,
-    MATRIX4              = 294,
-    IN_QUAL              = 295,
-    OUT_QUAL             = 296,
-    INOUT_QUAL           = 297,
-    UNIFORM              = 298,
-    VARYING              = 299,
-    MATRIX2x3            = 300,
-    MATRIX3x2            = 301,
-    MATRIX2x4            = 302,
-    MATRIX4x2            = 303,
-    MATRIX3x4            = 304,
-    MATRIX4x3            = 305,
-    CENTROID             = 306,
-    FLAT                 = 307,
-    SMOOTH               = 308,
-    READONLY             = 309,
-    WRITEONLY            = 310,
-    COHERENT             = 311,
-    RESTRICT             = 312,
-    VOLATILE             = 313,
-    STRUCT               = 314,
-    VOID_TYPE            = 315,
-    WHILE                = 316,
-    SAMPLER2D            = 317,
-    SAMPLERCUBE          = 318,
-    SAMPLER_EXTERNAL_OES = 319,
-    SAMPLER2DRECT        = 320,
-    SAMPLER2DARRAY       = 321,
-    ISAMPLER2D           = 322,
-    ISAMPLER3D           = 323,
-    ISAMPLERCUBE         = 324,
-    ISAMPLER2DARRAY      = 325,
-    USAMPLER2D           = 326,
-    USAMPLER3D           = 327,
-    USAMPLERCUBE         = 328,
-    USAMPLER2DARRAY      = 329,
-    SAMPLER3D            = 330,
-    SAMPLER3DRECT        = 331,
-    SAMPLER2DSHADOW      = 332,
-    SAMPLERCUBESHADOW    = 333,
-    SAMPLER2DARRAYSHADOW = 334,
-    IMAGE2D              = 335,
-    IIMAGE2D             = 336,
-    UIMAGE2D             = 337,
-    IMAGE3D              = 338,
-    IIMAGE3D             = 339,
-    UIMAGE3D             = 340,
-    IMAGE2DARRAY         = 341,
-    IIMAGE2DARRAY        = 342,
-    UIMAGE2DARRAY        = 343,
-    IMAGECUBE            = 344,
-    IIMAGECUBE           = 345,
-    UIMAGECUBE           = 346,
-    LAYOUT               = 347,
-    IDENTIFIER           = 348,
-    TYPE_NAME            = 349,
-    FLOATCONSTANT        = 350,
-    INTCONSTANT          = 351,
-    UINTCONSTANT         = 352,
-    BOOLCONSTANT         = 353,
-    FIELD_SELECTION      = 354,
-    LEFT_OP              = 355,
-    RIGHT_OP             = 356,
-    INC_OP               = 357,
-    DEC_OP               = 358,
-    LE_OP                = 359,
-    GE_OP                = 360,
-    EQ_OP                = 361,
-    NE_OP                = 362,
-    AND_OP               = 363,
-    OR_OP                = 364,
-    XOR_OP               = 365,
-    MUL_ASSIGN           = 366,
-    DIV_ASSIGN           = 367,
-    ADD_ASSIGN           = 368,
-    MOD_ASSIGN           = 369,
-    LEFT_ASSIGN          = 370,
-    RIGHT_ASSIGN         = 371,
-    AND_ASSIGN           = 372,
-    XOR_ASSIGN           = 373,
-    OR_ASSIGN            = 374,
-    SUB_ASSIGN           = 375,
-    LEFT_PAREN           = 376,
-    RIGHT_PAREN          = 377,
-    LEFT_BRACKET         = 378,
-    RIGHT_BRACKET        = 379,
-    LEFT_BRACE           = 380,
-    RIGHT_BRACE          = 381,
-    DOT                  = 382,
-    COMMA                = 383,
-    COLON                = 384,
-    EQUAL                = 385,
-    SEMICOLON            = 386,
-    BANG                 = 387,
-    DASH                 = 388,
-    TILDE                = 389,
-    PLUS                 = 390,
-    STAR                 = 391,
-    SLASH                = 392,
-    PERCENT              = 393,
-    LEFT_ANGLE           = 394,
-    RIGHT_ANGLE          = 395,
-    VERTICAL_BAR         = 396,
-    CARET                = 397,
-    AMPERSAND            = 398,
-    QUESTION             = 399
-};
+  enum yytokentype
+  {
+    INVARIANT = 258,
+    HIGH_PRECISION = 259,
+    MEDIUM_PRECISION = 260,
+    LOW_PRECISION = 261,
+    PRECISION = 262,
+    ATTRIBUTE = 263,
+    CONST_QUAL = 264,
+    BOOL_TYPE = 265,
+    FLOAT_TYPE = 266,
+    INT_TYPE = 267,
+    UINT_TYPE = 268,
+    BREAK = 269,
+    CONTINUE = 270,
+    DO = 271,
+    ELSE = 272,
+    FOR = 273,
+    IF = 274,
+    DISCARD = 275,
+    RETURN = 276,
+    SWITCH = 277,
+    CASE = 278,
+    DEFAULT = 279,
+    BVEC2 = 280,
+    BVEC3 = 281,
+    BVEC4 = 282,
+    IVEC2 = 283,
+    IVEC3 = 284,
+    IVEC4 = 285,
+    VEC2 = 286,
+    VEC3 = 287,
+    VEC4 = 288,
+    UVEC2 = 289,
+    UVEC3 = 290,
+    UVEC4 = 291,
+    MATRIX2 = 292,
+    MATRIX3 = 293,
+    MATRIX4 = 294,
+    IN_QUAL = 295,
+    OUT_QUAL = 296,
+    INOUT_QUAL = 297,
+    UNIFORM = 298,
+    VARYING = 299,
+    MATRIX2x3 = 300,
+    MATRIX3x2 = 301,
+    MATRIX2x4 = 302,
+    MATRIX4x2 = 303,
+    MATRIX3x4 = 304,
+    MATRIX4x3 = 305,
+    CENTROID = 306,
+    FLAT = 307,
+    SMOOTH = 308,
+    STRUCT = 309,
+    VOID_TYPE = 310,
+    WHILE = 311,
+    SAMPLER2D = 312,
+    SAMPLERCUBE = 313,
+    SAMPLER_EXTERNAL_OES = 314,
+    SAMPLER2DRECT = 315,
+    SAMPLER2DARRAY = 316,
+    ISAMPLER2D = 317,
+    ISAMPLER3D = 318,
+    ISAMPLERCUBE = 319,
+    ISAMPLER2DARRAY = 320,
+    USAMPLER2D = 321,
+    USAMPLER3D = 322,
+    USAMPLERCUBE = 323,
+    USAMPLER2DARRAY = 324,
+    SAMPLER3D = 325,
+    SAMPLER3DRECT = 326,
+    SAMPLER2DSHADOW = 327,
+    SAMPLERCUBESHADOW = 328,
+    SAMPLER2DARRAYSHADOW = 329,
+    LAYOUT = 330,
+    IDENTIFIER = 331,
+    TYPE_NAME = 332,
+    FLOATCONSTANT = 333,
+    INTCONSTANT = 334,
+    UINTCONSTANT = 335,
+    BOOLCONSTANT = 336,
+    FIELD_SELECTION = 337,
+    LEFT_OP = 338,
+    RIGHT_OP = 339,
+    INC_OP = 340,
+    DEC_OP = 341,
+    LE_OP = 342,
+    GE_OP = 343,
+    EQ_OP = 344,
+    NE_OP = 345,
+    AND_OP = 346,
+    OR_OP = 347,
+    XOR_OP = 348,
+    MUL_ASSIGN = 349,
+    DIV_ASSIGN = 350,
+    ADD_ASSIGN = 351,
+    MOD_ASSIGN = 352,
+    LEFT_ASSIGN = 353,
+    RIGHT_ASSIGN = 354,
+    AND_ASSIGN = 355,
+    XOR_ASSIGN = 356,
+    OR_ASSIGN = 357,
+    SUB_ASSIGN = 358,
+    LEFT_PAREN = 359,
+    RIGHT_PAREN = 360,
+    LEFT_BRACKET = 361,
+    RIGHT_BRACKET = 362,
+    LEFT_BRACE = 363,
+    RIGHT_BRACE = 364,
+    DOT = 365,
+    COMMA = 366,
+    COLON = 367,
+    EQUAL = 368,
+    SEMICOLON = 369,
+    BANG = 370,
+    DASH = 371,
+    TILDE = 372,
+    PLUS = 373,
+    STAR = 374,
+    SLASH = 375,
+    PERCENT = 376,
+    LEFT_ANGLE = 377,
+    RIGHT_ANGLE = 378,
+    VERTICAL_BAR = 379,
+    CARET = 380,
+    AMPERSAND = 381,
+    QUESTION = 382
+  };
 #endif
 
 /* Value type.  */
@@ -217,27 +200,22 @@ union YYSTYPE
     struct {
         TOperator op;
         union {
-            TIntermNode *intermNode;
+            TIntermNode* intermNode;
             TIntermNodePair nodePair;
-            TIntermTyped *intermTypedNode;
-            TIntermAggregate *intermAggregate;
-            TIntermBlock *intermBlock;
-            TIntermDeclaration *intermDeclaration;
-            TIntermSwitch *intermSwitch;
-            TIntermCase *intermCase;
+            TIntermTyped* intermTypedNode;
+            TIntermAggregate* intermAggregate;
+            TIntermSwitch* intermSwitch;
+            TIntermCase* intermCase;
         };
         union {
-            TTypeSpecifierNonArray typeSpecifierNonArray;
             TPublicType type;
             TPrecision precision;
             TLayoutQualifier layoutQualifier;
             TQualifier qualifier;
-            TFunction *function;
+            TFunction* function;
             TParameter param;
-            TField *field;
-            TFieldList *fieldList;
-            TQualifierWrapperBase *qualifierWrapper;
-            TTypeQualifierBuilder *typeQualifierBuilder;
+            TField* field;
+            TFieldList* fieldList;
         };
     } interm;