diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2012-11-09 12:26:42 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2012-12-06 12:13:22 -0800 |
| commit | 62c0938639401dbf75c61ed7f6f10fd860994cfd (patch) | |
| tree | 56b68b24b5a67ab19e019f9df9b009cfcc85c62c /src/glsl/glsl_lexer.ll | |
| parent | 486f9556548292e776781e85052ec4122180891d (diff) | |
| download | external_mesa3d-62c0938639401dbf75c61ed7f6f10fd860994cfd.zip external_mesa3d-62c0938639401dbf75c61ed7f6f10fd860994cfd.tar.gz external_mesa3d-62c0938639401dbf75c61ed7f6f10fd860994cfd.tar.bz2 | |
glsl: Allow layout qualifiers in GLSL 3.00 ES
Note that while 'packed' is a reserved word in GLSL ES, row_major is not.
This means that we have to use the string-based matching for that.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Acked-by: Carl Worth <cworth@cworth.org>
Diffstat (limited to 'src/glsl/glsl_lexer.ll')
| -rw-r--r-- | src/glsl/glsl_lexer.ll | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll index af39512..2f66c58 100644 --- a/src/glsl/glsl_lexer.ll +++ b/src/glsl/glsl_lexer.ll @@ -437,7 +437,7 @@ enum KEYWORD(110, 100, 0, 0, ENUM); typedef KEYWORD(110, 100, 0, 0, TYPEDEF); template KEYWORD(110, 100, 0, 0, TEMPLATE); this KEYWORD(110, 100, 0, 0, THIS); -packed KEYWORD_WITH_ALT(110, 100, 140, 0, yyextra->ARB_uniform_buffer_object_enable, PACKED_TOK); +packed KEYWORD_WITH_ALT(110, 100, 140, 300, yyextra->ARB_uniform_buffer_object_enable, PACKED_TOK); goto KEYWORD(110, 100, 0, 0, GOTO); switch KEYWORD(110, 100, 130, 300, SWITCH); default KEYWORD(110, 100, 130, 300, DEFAULT); |