diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2013-07-18 16:31:05 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2013-07-18 16:57:22 -0700 |
| commit | 0cb90fcfbde5369f76c2e24b9fa2cbfc4f7557fc (patch) | |
| tree | c73d39165c0dcb19098481da183e6448cfb09bd9 | |
| parent | 89f75e7e7b3ba96f715fb5c2878e3f88036a6533 (diff) | |
glsl: Allow duplicate layout qualifiers with 420pack.
The new 4.20 rules explicitly allow multiple layout(...) sections.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
| -rw-r--r-- | src/glsl/glsl_parser.yy | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index c31f5e26481..381fa2b5289 100644 --- a/src/glsl/glsl_parser.yy +++ b/src/glsl/glsl_parser.yy @@ -1385,7 +1385,7 @@ type_qualifier: * appear to be any text indicating that it must come before the storage * qualifier, but always seems to in examples. */ - if ($2.has_layout()) + if (!state->ARB_shading_language_420pack_enable && $2.has_layout()) _mesa_glsl_error(&@1, state, "Duplicate layout(...) qualifiers.\n"); if ($2.flags.q.invariant) |