From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 17 Jul 2013 17:39:59 +0000 (-0700)
Subject: glsl: Have the lexer return LAYOUT_TOK if 420pack is enabled.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7f6a2d6937e837e06d9e22d173d996397ff4cacf;p=mesa.git

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 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);