mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-04 11:58:10 +02:00
glsl2: Commit generated files changed by previous two commits
This commit is contained in:
Ian Romanick
parent
5c77efc0b2
commit
103453659d
3 changed files with 1481 additions and 1570 deletions
|
|
@ -1415,17 +1415,17 @@ return CONST_TOK;
|
|||
case 17:
|
||||
YY_RULE_SETUP
|
||||
#line 131 "glsl_lexer.lpp"
|
||||
return BOOL;
|
||||
return BOOL_TOK;
|
||||
YY_BREAK
|
||||
case 18:
|
||||
YY_RULE_SETUP
|
||||
#line 132 "glsl_lexer.lpp"
|
||||
return FLOAT;
|
||||
return FLOAT_TOK;
|
||||
YY_BREAK
|
||||
case 19:
|
||||
YY_RULE_SETUP
|
||||
#line 133 "glsl_lexer.lpp"
|
||||
return INT;
|
||||
return INT_TOK;
|
||||
YY_BREAK
|
||||
case 20:
|
||||
YY_RULE_SETUP
|
||||
|
|
@ -1520,17 +1520,17 @@ return VEC4;
|
|||
case 38:
|
||||
YY_RULE_SETUP
|
||||
#line 154 "glsl_lexer.lpp"
|
||||
return MAT2;
|
||||
return MAT2X2;
|
||||
YY_BREAK
|
||||
case 39:
|
||||
YY_RULE_SETUP
|
||||
#line 155 "glsl_lexer.lpp"
|
||||
return MAT3;
|
||||
return MAT3X3;
|
||||
YY_BREAK
|
||||
case 40:
|
||||
YY_RULE_SETUP
|
||||
#line 156 "glsl_lexer.lpp"
|
||||
return MAT4;
|
||||
return MAT4X4;
|
||||
YY_BREAK
|
||||
case 41:
|
||||
YY_RULE_SETUP
|
||||
|
|
@ -1580,17 +1580,17 @@ TOKEN_OR_IDENTIFIER(120, MAT4X4);
|
|||
case 50:
|
||||
YY_RULE_SETUP
|
||||
#line 167 "glsl_lexer.lpp"
|
||||
return IN;
|
||||
return IN_TOK;
|
||||
YY_BREAK
|
||||
case 51:
|
||||
YY_RULE_SETUP
|
||||
#line 168 "glsl_lexer.lpp"
|
||||
return OUT;
|
||||
return OUT_TOK;
|
||||
YY_BREAK
|
||||
case 52:
|
||||
YY_RULE_SETUP
|
||||
#line 169 "glsl_lexer.lpp"
|
||||
return INOUT;
|
||||
return INOUT_TOK;
|
||||
YY_BREAK
|
||||
case 53:
|
||||
YY_RULE_SETUP
|
||||
|
|
@ -1665,7 +1665,7 @@ return STRUCT;
|
|||
case 67:
|
||||
YY_RULE_SETUP
|
||||
#line 187 "glsl_lexer.lpp"
|
||||
return VOID;
|
||||
return VOID_TOK;
|
||||
YY_BREAK
|
||||
case 68:
|
||||
YY_RULE_SETUP
|
||||
|
|
@ -1894,7 +1894,7 @@ RESERVED_WORD(999, THIS);
|
|||
case 105:
|
||||
YY_RULE_SETUP
|
||||
#line 272 "glsl_lexer.lpp"
|
||||
RESERVED_WORD(999, PACKED);
|
||||
RESERVED_WORD(999, PACKED_TOK);
|
||||
YY_BREAK
|
||||
case 106:
|
||||
YY_RULE_SETUP
|
||||
|
|
@ -1954,17 +1954,17 @@ RESERVED_WORD(999, INTERFACE);
|
|||
case 117:
|
||||
YY_RULE_SETUP
|
||||
#line 284 "glsl_lexer.lpp"
|
||||
RESERVED_WORD(999, LONG);
|
||||
RESERVED_WORD(999, LONG_TOK);
|
||||
YY_BREAK
|
||||
case 118:
|
||||
YY_RULE_SETUP
|
||||
#line 285 "glsl_lexer.lpp"
|
||||
RESERVED_WORD(999, SHORT);
|
||||
RESERVED_WORD(999, SHORT_TOK);
|
||||
YY_BREAK
|
||||
case 119:
|
||||
YY_RULE_SETUP
|
||||
#line 286 "glsl_lexer.lpp"
|
||||
RESERVED_WORD(999, DOUBLE);
|
||||
RESERVED_WORD(999, DOUBLE_TOK);
|
||||
YY_BREAK
|
||||
case 120:
|
||||
YY_RULE_SETUP
|
||||
|
|
@ -1974,7 +1974,7 @@ RESERVED_WORD(999, HALF);
|
|||
case 121:
|
||||
YY_RULE_SETUP
|
||||
#line 288 "glsl_lexer.lpp"
|
||||
RESERVED_WORD(999, FIXED);
|
||||
RESERVED_WORD(999, FIXED_TOK);
|
||||
YY_BREAK
|
||||
case 122:
|
||||
YY_RULE_SETUP
|
||||
|
|
@ -1984,7 +1984,7 @@ RESERVED_WORD(999, UNSIGNED);
|
|||
case 123:
|
||||
YY_RULE_SETUP
|
||||
#line 290 "glsl_lexer.lpp"
|
||||
RESERVED_WORD(999, INPUT);
|
||||
RESERVED_WORD(999, INPUT_TOK);
|
||||
YY_BREAK
|
||||
case 124:
|
||||
YY_RULE_SETUP
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -41,10 +41,10 @@
|
|||
enum yytokentype {
|
||||
ATTRIBUTE = 258,
|
||||
CONST_TOK = 259,
|
||||
BOOL = 260,
|
||||
FLOAT = 261,
|
||||
INT = 262,
|
||||
UINT = 263,
|
||||
BOOL_TOK = 260,
|
||||
FLOAT_TOK = 261,
|
||||
INT_TOK = 262,
|
||||
UINT_TOK = 263,
|
||||
BREAK = 264,
|
||||
CONTINUE = 265,
|
||||
DO = 266,
|
||||
|
|
@ -68,165 +68,162 @@
|
|||
VEC2 = 284,
|
||||
VEC3 = 285,
|
||||
VEC4 = 286,
|
||||
MAT2 = 287,
|
||||
MAT3 = 288,
|
||||
MAT4 = 289,
|
||||
CENTROID = 290,
|
||||
IN = 291,
|
||||
OUT = 292,
|
||||
INOUT = 293,
|
||||
UNIFORM = 294,
|
||||
VARYING = 295,
|
||||
NOPERSPECTIVE = 296,
|
||||
FLAT = 297,
|
||||
SMOOTH = 298,
|
||||
MAT2X2 = 299,
|
||||
MAT2X3 = 300,
|
||||
MAT2X4 = 301,
|
||||
MAT3X2 = 302,
|
||||
MAT3X3 = 303,
|
||||
MAT3X4 = 304,
|
||||
MAT4X2 = 305,
|
||||
MAT4X3 = 306,
|
||||
MAT4X4 = 307,
|
||||
SAMPLER1D = 308,
|
||||
SAMPLER2D = 309,
|
||||
SAMPLER3D = 310,
|
||||
SAMPLERCUBE = 311,
|
||||
SAMPLER1DSHADOW = 312,
|
||||
SAMPLER2DSHADOW = 313,
|
||||
SAMPLERCUBESHADOW = 314,
|
||||
SAMPLER1DARRAY = 315,
|
||||
SAMPLER2DARRAY = 316,
|
||||
SAMPLER1DARRAYSHADOW = 317,
|
||||
SAMPLER2DARRAYSHADOW = 318,
|
||||
ISAMPLER1D = 319,
|
||||
ISAMPLER2D = 320,
|
||||
ISAMPLER3D = 321,
|
||||
ISAMPLERCUBE = 322,
|
||||
ISAMPLER1DARRAY = 323,
|
||||
ISAMPLER2DARRAY = 324,
|
||||
USAMPLER1D = 325,
|
||||
USAMPLER2D = 326,
|
||||
USAMPLER3D = 327,
|
||||
USAMPLERCUBE = 328,
|
||||
USAMPLER1DARRAY = 329,
|
||||
USAMPLER2DARRAY = 330,
|
||||
STRUCT = 331,
|
||||
VOID = 332,
|
||||
WHILE = 333,
|
||||
IDENTIFIER = 334,
|
||||
FLOATCONSTANT = 335,
|
||||
INTCONSTANT = 336,
|
||||
UINTCONSTANT = 337,
|
||||
BOOLCONSTANT = 338,
|
||||
FIELD_SELECTION = 339,
|
||||
LEFT_OP = 340,
|
||||
RIGHT_OP = 341,
|
||||
INC_OP = 342,
|
||||
DEC_OP = 343,
|
||||
LE_OP = 344,
|
||||
GE_OP = 345,
|
||||
EQ_OP = 346,
|
||||
NE_OP = 347,
|
||||
AND_OP = 348,
|
||||
OR_OP = 349,
|
||||
XOR_OP = 350,
|
||||
MUL_ASSIGN = 351,
|
||||
DIV_ASSIGN = 352,
|
||||
ADD_ASSIGN = 353,
|
||||
MOD_ASSIGN = 354,
|
||||
LEFT_ASSIGN = 355,
|
||||
RIGHT_ASSIGN = 356,
|
||||
AND_ASSIGN = 357,
|
||||
XOR_ASSIGN = 358,
|
||||
OR_ASSIGN = 359,
|
||||
SUB_ASSIGN = 360,
|
||||
INVARIANT = 361,
|
||||
LOWP = 362,
|
||||
MEDIUMP = 363,
|
||||
HIGHP = 364,
|
||||
SUPERP = 365,
|
||||
PRECISION = 366,
|
||||
VERSION = 367,
|
||||
EXTENSION = 368,
|
||||
LINE = 369,
|
||||
PRAGMA = 370,
|
||||
COLON = 371,
|
||||
EOL = 372,
|
||||
INTERFACE = 373,
|
||||
OUTPUT = 374,
|
||||
LAYOUT_TOK = 375,
|
||||
ASM = 376,
|
||||
CLASS = 377,
|
||||
UNION = 378,
|
||||
ENUM = 379,
|
||||
TYPEDEF = 380,
|
||||
TEMPLATE = 381,
|
||||
THIS = 382,
|
||||
PACKED = 383,
|
||||
GOTO = 384,
|
||||
INLINE_TOK = 385,
|
||||
NOINLINE = 386,
|
||||
VOLATILE = 387,
|
||||
PUBLIC_TOK = 388,
|
||||
STATIC = 389,
|
||||
EXTERN = 390,
|
||||
EXTERNAL = 391,
|
||||
LONG = 392,
|
||||
SHORT = 393,
|
||||
DOUBLE = 394,
|
||||
HALF = 395,
|
||||
FIXED = 396,
|
||||
UNSIGNED = 397,
|
||||
INPUT = 398,
|
||||
OUPTUT = 399,
|
||||
HVEC2 = 400,
|
||||
HVEC3 = 401,
|
||||
HVEC4 = 402,
|
||||
DVEC2 = 403,
|
||||
DVEC3 = 404,
|
||||
DVEC4 = 405,
|
||||
FVEC2 = 406,
|
||||
FVEC3 = 407,
|
||||
FVEC4 = 408,
|
||||
SAMPLER2DRECT = 409,
|
||||
SAMPLER3DRECT = 410,
|
||||
SAMPLER2DRECTSHADOW = 411,
|
||||
SIZEOF = 412,
|
||||
CAST = 413,
|
||||
NAMESPACE = 414,
|
||||
USING = 415,
|
||||
ERROR_TOK = 416,
|
||||
COMMON = 417,
|
||||
PARTITION = 418,
|
||||
ACTIVE = 419,
|
||||
SAMPLERBUFFER = 420,
|
||||
FILTER = 421,
|
||||
IMAGE1D = 422,
|
||||
IMAGE2D = 423,
|
||||
IMAGE3D = 424,
|
||||
IMAGECUBE = 425,
|
||||
IMAGE1DARRAY = 426,
|
||||
IMAGE2DARRAY = 427,
|
||||
IIMAGE1D = 428,
|
||||
IIMAGE2D = 429,
|
||||
IIMAGE3D = 430,
|
||||
IIMAGECUBE = 431,
|
||||
IIMAGE1DARRAY = 432,
|
||||
IIMAGE2DARRAY = 433,
|
||||
UIMAGE1D = 434,
|
||||
UIMAGE2D = 435,
|
||||
UIMAGE3D = 436,
|
||||
UIMAGECUBE = 437,
|
||||
UIMAGE1DARRAY = 438,
|
||||
UIMAGE2DARRAY = 439,
|
||||
IMAGE1DSHADOW = 440,
|
||||
IMAGE2DSHADOW = 441,
|
||||
IMAGEBUFFER = 442,
|
||||
IIMAGEBUFFER = 443,
|
||||
UIMAGEBUFFER = 444,
|
||||
ROW_MAJOR = 445
|
||||
CENTROID = 287,
|
||||
IN_TOK = 288,
|
||||
OUT_TOK = 289,
|
||||
INOUT_TOK = 290,
|
||||
UNIFORM = 291,
|
||||
VARYING = 292,
|
||||
NOPERSPECTIVE = 293,
|
||||
FLAT = 294,
|
||||
SMOOTH = 295,
|
||||
MAT2X2 = 296,
|
||||
MAT2X3 = 297,
|
||||
MAT2X4 = 298,
|
||||
MAT3X2 = 299,
|
||||
MAT3X3 = 300,
|
||||
MAT3X4 = 301,
|
||||
MAT4X2 = 302,
|
||||
MAT4X3 = 303,
|
||||
MAT4X4 = 304,
|
||||
SAMPLER1D = 305,
|
||||
SAMPLER2D = 306,
|
||||
SAMPLER3D = 307,
|
||||
SAMPLERCUBE = 308,
|
||||
SAMPLER1DSHADOW = 309,
|
||||
SAMPLER2DSHADOW = 310,
|
||||
SAMPLERCUBESHADOW = 311,
|
||||
SAMPLER1DARRAY = 312,
|
||||
SAMPLER2DARRAY = 313,
|
||||
SAMPLER1DARRAYSHADOW = 314,
|
||||
SAMPLER2DARRAYSHADOW = 315,
|
||||
ISAMPLER1D = 316,
|
||||
ISAMPLER2D = 317,
|
||||
ISAMPLER3D = 318,
|
||||
ISAMPLERCUBE = 319,
|
||||
ISAMPLER1DARRAY = 320,
|
||||
ISAMPLER2DARRAY = 321,
|
||||
USAMPLER1D = 322,
|
||||
USAMPLER2D = 323,
|
||||
USAMPLER3D = 324,
|
||||
USAMPLERCUBE = 325,
|
||||
USAMPLER1DARRAY = 326,
|
||||
USAMPLER2DARRAY = 327,
|
||||
STRUCT = 328,
|
||||
VOID_TOK = 329,
|
||||
WHILE = 330,
|
||||
IDENTIFIER = 331,
|
||||
FLOATCONSTANT = 332,
|
||||
INTCONSTANT = 333,
|
||||
UINTCONSTANT = 334,
|
||||
BOOLCONSTANT = 335,
|
||||
FIELD_SELECTION = 336,
|
||||
LEFT_OP = 337,
|
||||
RIGHT_OP = 338,
|
||||
INC_OP = 339,
|
||||
DEC_OP = 340,
|
||||
LE_OP = 341,
|
||||
GE_OP = 342,
|
||||
EQ_OP = 343,
|
||||
NE_OP = 344,
|
||||
AND_OP = 345,
|
||||
OR_OP = 346,
|
||||
XOR_OP = 347,
|
||||
MUL_ASSIGN = 348,
|
||||
DIV_ASSIGN = 349,
|
||||
ADD_ASSIGN = 350,
|
||||
MOD_ASSIGN = 351,
|
||||
LEFT_ASSIGN = 352,
|
||||
RIGHT_ASSIGN = 353,
|
||||
AND_ASSIGN = 354,
|
||||
XOR_ASSIGN = 355,
|
||||
OR_ASSIGN = 356,
|
||||
SUB_ASSIGN = 357,
|
||||
INVARIANT = 358,
|
||||
LOWP = 359,
|
||||
MEDIUMP = 360,
|
||||
HIGHP = 361,
|
||||
SUPERP = 362,
|
||||
PRECISION = 363,
|
||||
VERSION = 364,
|
||||
EXTENSION = 365,
|
||||
LINE = 366,
|
||||
PRAGMA = 367,
|
||||
COLON = 368,
|
||||
EOL = 369,
|
||||
INTERFACE = 370,
|
||||
OUTPUT = 371,
|
||||
LAYOUT_TOK = 372,
|
||||
ASM = 373,
|
||||
CLASS = 374,
|
||||
UNION = 375,
|
||||
ENUM = 376,
|
||||
TYPEDEF = 377,
|
||||
TEMPLATE = 378,
|
||||
THIS = 379,
|
||||
PACKED_TOK = 380,
|
||||
GOTO = 381,
|
||||
INLINE_TOK = 382,
|
||||
NOINLINE = 383,
|
||||
VOLATILE = 384,
|
||||
PUBLIC_TOK = 385,
|
||||
STATIC = 386,
|
||||
EXTERN = 387,
|
||||
EXTERNAL = 388,
|
||||
LONG_TOK = 389,
|
||||
SHORT_TOK = 390,
|
||||
DOUBLE_TOK = 391,
|
||||
HALF = 392,
|
||||
FIXED_TOK = 393,
|
||||
UNSIGNED = 394,
|
||||
INPUT_TOK = 395,
|
||||
OUPTUT = 396,
|
||||
HVEC2 = 397,
|
||||
HVEC3 = 398,
|
||||
HVEC4 = 399,
|
||||
DVEC2 = 400,
|
||||
DVEC3 = 401,
|
||||
DVEC4 = 402,
|
||||
FVEC2 = 403,
|
||||
FVEC3 = 404,
|
||||
FVEC4 = 405,
|
||||
SAMPLER2DRECT = 406,
|
||||
SAMPLER3DRECT = 407,
|
||||
SAMPLER2DRECTSHADOW = 408,
|
||||
SIZEOF = 409,
|
||||
CAST = 410,
|
||||
NAMESPACE = 411,
|
||||
USING = 412,
|
||||
ERROR_TOK = 413,
|
||||
COMMON = 414,
|
||||
PARTITION = 415,
|
||||
ACTIVE = 416,
|
||||
SAMPLERBUFFER = 417,
|
||||
FILTER = 418,
|
||||
IMAGE1D = 419,
|
||||
IMAGE2D = 420,
|
||||
IMAGE3D = 421,
|
||||
IMAGECUBE = 422,
|
||||
IMAGE1DARRAY = 423,
|
||||
IMAGE2DARRAY = 424,
|
||||
IIMAGE1D = 425,
|
||||
IIMAGE2D = 426,
|
||||
IIMAGE3D = 427,
|
||||
IIMAGECUBE = 428,
|
||||
IIMAGE1DARRAY = 429,
|
||||
IIMAGE2DARRAY = 430,
|
||||
UIMAGE1D = 431,
|
||||
UIMAGE2D = 432,
|
||||
UIMAGE3D = 433,
|
||||
UIMAGECUBE = 434,
|
||||
UIMAGE1DARRAY = 435,
|
||||
UIMAGE2DARRAY = 436,
|
||||
IMAGE1DSHADOW = 437,
|
||||
IMAGE2DSHADOW = 438,
|
||||
IMAGEBUFFER = 439,
|
||||
IIMAGEBUFFER = 440,
|
||||
UIMAGEBUFFER = 441,
|
||||
ROW_MAJOR = 442
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
@ -268,7 +265,7 @@ typedef union YYSTYPE
|
|||
|
||||
|
||||
/* Line 1676 of yacc.c */
|
||||
#line 272 "glsl_parser.h"
|
||||
#line 269 "glsl_parser.h"
|
||||
} YYSTYPE;
|
||||
# define YYSTYPE_IS_TRIVIAL 1
|
||||
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue