diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-19 08:33:43 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-19 08:33:43 +0200 |
| commit | 45b71fd5b777a968310c537ace5efcd1443085a0 (patch) | |
| tree | a3ef2b449659c3ba6c885d169c7796b3ef948867 /mesalib/src/glsl/glsl_lexer.ll | |
| parent | 08bafbbe05abefabdb0c3238c3d9ecdcce1b692f (diff) | |
| parent | 89bc3ee988b62eb5e10284bac32a176955546410 (diff) | |
| download | vcxsrv-45b71fd5b777a968310c537ace5efcd1443085a0.tar.gz vcxsrv-45b71fd5b777a968310c537ace5efcd1443085a0.tar.bz2 vcxsrv-45b71fd5b777a968310c537ace5efcd1443085a0.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xkbcomp git update 19 Jul 2013
Diffstat (limited to 'mesalib/src/glsl/glsl_lexer.ll')
| -rw-r--r-- | mesalib/src/glsl/glsl_lexer.ll | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/src/glsl/glsl_lexer.ll b/mesalib/src/glsl/glsl_lexer.ll index e66ce7bee..dbc8154e4 100644 --- a/mesalib/src/glsl/glsl_lexer.ll +++ b/mesalib/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); |