summaryrefslogtreecommitdiff
path: root/src/glsl/glsl_parser.h
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2010-08-11 17:03:37 -0700
committerIan Romanick <ian.d.romanick@intel.com>2010-08-11 17:03:37 -0700
commitdb36e88052918ad383c3acdd24f2b9864e240ddb (patch)
tree5ebe99f84270858f7175fe82509cbb8315df7a45 /src/glsl/glsl_parser.h
parent77215e7e7babe73e5d959ab5ad82054a8d73c538 (diff)
glsl2: Commit generated files changed by previous commit
Diffstat (limited to 'src/glsl/glsl_parser.h')
-rw-r--r--src/glsl/glsl_parser.h61
1 files changed, 31 insertions, 30 deletions
diff --git a/src/glsl/glsl_parser.h b/src/glsl/glsl_parser.h
index 470c080f72..b9f3e3fe04 100644
--- a/src/glsl/glsl_parser.h
+++ b/src/glsl/glsl_parser.h
@@ -197,35 +197,36 @@
CAST = 413,
NAMESPACE = 414,
USING = 415,
- COMMON = 416,
- PARTITION = 417,
- ACTIVE = 418,
- SAMPLERBUFFER = 419,
- FILTER = 420,
- IMAGE1D = 421,
- IMAGE2D = 422,
- IMAGE3D = 423,
- IMAGECUBE = 424,
- IMAGE1DARRAY = 425,
- IMAGE2DARRAY = 426,
- IIMAGE1D = 427,
- IIMAGE2D = 428,
- IIMAGE3D = 429,
- IIMAGECUBE = 430,
- IIMAGE1DARRAY = 431,
- IIMAGE2DARRAY = 432,
- UIMAGE1D = 433,
- UIMAGE2D = 434,
- UIMAGE3D = 435,
- UIMAGECUBE = 436,
- UIMAGE1DARRAY = 437,
- UIMAGE2DARRAY = 438,
- IMAGE1DSHADOW = 439,
- IMAGE2DSHADOW = 440,
- IMAGEBUFFER = 441,
- IIMAGEBUFFER = 442,
- UIMAGEBUFFER = 443,
- ROW_MAJOR = 444
+ 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
};
#endif
@@ -267,7 +268,7 @@ typedef union YYSTYPE
/* Line 1676 of yacc.c */
-#line 271 "glsl_parser.h"
+#line 272 "glsl_parser.h"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */