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 <kenneth@whitecape.org>
Reviewed-by: Paul Berry <stereotype441@gmail.com>

diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll
index e66ce7beeb9f202d40463302c8de5e85708ff7bd..dbc8154e499597c8caee0d439c4b28e8c02595a3 100644 (file)
--- 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);