diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2013-07-17 10:39:59 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2013-07-18 16:57:23 -0700 |
| commit | 7f6a2d6937e837e06d9e22d173d996397ff4cacf (patch) | |
| tree | 9b739577073410b3251f9e62901848691f4a164f | |
| parent | 56bcde34b2d3451d81878da17cacccf4d9bba5bc (diff) | |
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>
| -rw-r--r-- | src/glsl/glsl_lexer.ll | 3 |
1 files changed, 2 insertions, 1 deletions
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); |