summaryrefslogtreecommitdiff
path: root/src/glsl/glsl_parser.h
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2010-06-30 17:30:03 -0700
committerEric Anholt <eric@anholt.net>2010-07-28 14:14:38 -0700
commitf50f06552eb1e4af27d6fe99c381eac6a0a4ea0f (patch)
tree76891e2f6c5f116f1feb30e36155d52269d3cfa2 /src/glsl/glsl_parser.h
parentb706283c79de41caf775b0bb15b3c849932f2574 (diff)
glsl2: Parser support for GL_ARB_fragment_coord_conventions
Diffstat (limited to 'src/glsl/glsl_parser.h')
-rw-r--r--src/glsl/glsl_parser.h83
1 files changed, 42 insertions, 41 deletions
diff --git a/src/glsl/glsl_parser.h b/src/glsl/glsl_parser.h
index 6cbab40557b..9c4e12fd7ef 100644
--- a/src/glsl/glsl_parser.h
+++ b/src/glsl/glsl_parser.h
@@ -155,46 +155,47 @@
EOL = 371,
INTERFACE = 372,
OUTPUT = 373,
- ASM = 374,
- CLASS = 375,
- UNION = 376,
- ENUM = 377,
- TYPEDEF = 378,
- TEMPLATE = 379,
- THIS = 380,
- PACKED = 381,
- GOTO = 382,
- INLINE_TOK = 383,
- NOINLINE = 384,
- VOLATILE = 385,
- PUBLIC_TOK = 386,
- STATIC = 387,
- EXTERN = 388,
- EXTERNAL = 389,
- LONG = 390,
- SHORT = 391,
- DOUBLE = 392,
- HALF = 393,
- FIXED = 394,
- UNSIGNED = 395,
- INPUT = 396,
- OUPTUT = 397,
- HVEC2 = 398,
- HVEC3 = 399,
- HVEC4 = 400,
- DVEC2 = 401,
- DVEC3 = 402,
- DVEC4 = 403,
- FVEC2 = 404,
- FVEC3 = 405,
- FVEC4 = 406,
- SAMPLER2DRECT = 407,
- SAMPLER3DRECT = 408,
- SAMPLER2DRECTSHADOW = 409,
- SIZEOF = 410,
- CAST = 411,
- NAMESPACE = 412,
- USING = 413
+ LAYOUT_TOK = 374,
+ ASM = 375,
+ CLASS = 376,
+ UNION = 377,
+ ENUM = 378,
+ TYPEDEF = 379,
+ TEMPLATE = 380,
+ THIS = 381,
+ PACKED = 382,
+ GOTO = 383,
+ INLINE_TOK = 384,
+ NOINLINE = 385,
+ VOLATILE = 386,
+ PUBLIC_TOK = 387,
+ STATIC = 388,
+ EXTERN = 389,
+ EXTERNAL = 390,
+ LONG = 391,
+ SHORT = 392,
+ DOUBLE = 393,
+ HALF = 394,
+ FIXED = 395,
+ UNSIGNED = 396,
+ INPUT = 397,
+ OUPTUT = 398,
+ HVEC2 = 399,
+ HVEC3 = 400,
+ HVEC4 = 401,
+ DVEC2 = 402,
+ DVEC3 = 403,
+ DVEC4 = 404,
+ FVEC2 = 405,
+ FVEC3 = 406,
+ FVEC4 = 407,
+ SAMPLER2DRECT = 408,
+ SAMPLER3DRECT = 409,
+ SAMPLER2DRECTSHADOW = 410,
+ SIZEOF = 411,
+ CAST = 412,
+ NAMESPACE = 413,
+ USING = 414
};
#endif
@@ -236,7 +237,7 @@ typedef union YYSTYPE
/* Line 1676 of yacc.c */
-#line 240 "glsl_parser.h"
+#line 241 "glsl_parser.h"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */