From 62c0938639401dbf75c61ed7f6f10fd860994cfd Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Fri, 9 Nov 2012 12:26:42 -0800 Subject: 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 Reviewed-by: Kenneth Graunke Reviewed-by: Eric Anholt Acked-by: Carl Worth --- src/glsl/glsl_lexer.ll | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/glsl/glsl_lexer.ll') 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); -- cgit v1.1