From 7f6a2d6937e837e06d9e22d173d996397ff4cacf Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Wed, 17 Jul 2013 10:39:59 -0700 Subject: glsl: Have the lexer return LAYOUT_TOK if 420pack is enabled. GL_ARB_shading_language_420pack also provides layout qualifiers. Signed-off-by: Kenneth Graunke Reviewed-by: Paul Berry --- src/glsl/glsl_lexer.ll | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll index e66ce7beeb9..dbc8154e499 100644 --- a/src/glsl/glsl_lexer.ll +++ b/src/glsl/glsl_lexer.ll @@ -366,7 +366,8 @@ layout { || yyextra->ARB_conservative_depth_enable || yyextra->ARB_explicit_attrib_location_enable || yyextra->ARB_uniform_buffer_object_enable - || yyextra->ARB_fragment_coord_conventions_enable) { + || yyextra->ARB_fragment_coord_conventions_enable + || yyextra->ARB_shading_language_420pack_enable) { return LAYOUT_TOK; } else { yylval->identifier = strdup(yytext); -- cgit v1.2.3