diff options
| author | Matt Turner <mattst88@gmail.com> | 2013-07-11 10:11:18 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2013-07-11 16:22:07 -0700 |
| commit | 14ed9018de1e8816f3b99165a6e2afb1acc1d5d7 (patch) | |
| tree | ee436d5ddbd16409d1c1280dccdd745eaf07b501 /src/glsl | |
| parent | c30948517ee8640e2aa74bef63f6d7668b918ed9 (diff) | |
| download | external_mesa3d-14ed9018de1e8816f3b99165a6e2afb1acc1d5d7.zip external_mesa3d-14ed9018de1e8816f3b99165a6e2afb1acc1d5d7.tar.gz external_mesa3d-14ed9018de1e8816f3b99165a6e2afb1acc1d5d7.tar.bz2 | |
glsl: Mark "row_major" as not a reserved word in GLSL ES 3.0.
We mark ARB_uniform_buffer_object as enabled under ES 3 since it
contains that functionality, which tricked the compiler into tokenizing
"row_major".
Acked-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/glsl_lexer.ll | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll index 008ef30..e66ce7b 100644 --- a/src/glsl/glsl_lexer.ll +++ b/src/glsl/glsl_lexer.ll @@ -72,7 +72,7 @@ static int classify_identifier(struct _mesa_glsl_parse_state *, const char *); alt_expr, token) \ do { \ if (yyextra->is_version(allowed_glsl, allowed_glsl_es) \ - || alt_expr) { \ + || (alt_expr)) { \ return token; \ } else if (yyextra->is_version(reserved_glsl, \ reserved_glsl_es)) { \ @@ -522,7 +522,7 @@ image2DArrayShadow KEYWORD(130, 300, 0, 0, IMAGE2DARRAYSHADOW); imageBuffer KEYWORD(130, 300, 0, 0, IMAGEBUFFER); iimageBuffer KEYWORD(130, 300, 0, 0, IIMAGEBUFFER); uimageBuffer KEYWORD(130, 300, 0, 0, UIMAGEBUFFER); -row_major KEYWORD_WITH_ALT(130, 0, 140, 0, yyextra->ARB_uniform_buffer_object_enable, ROW_MAJOR); +row_major KEYWORD_WITH_ALT(130, 0, 140, 0, yyextra->ARB_uniform_buffer_object_enable && !yyextra->es_shader, ROW_MAJOR); /* Additional reserved words in GLSL 1.40 */ isampler2DRect KEYWORD(140, 300, 140, 0, ISAMPLER2DRECT); |