diff options
| author | Kenneth Graunke <[email protected]> | 2013-07-15 19:01:28 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2013-07-18 16:57:23 -0700 |
| commit | c397ec94e9a54521a873e84867268c40c73db79c (patch) | |
| tree | 5b7f484f6268cdd1c95b1bedc67e46c363869d10 /src | |
| parent | b5d6c51e2bff2a11d8150c04e5e470be941911a7 (diff) | |
glsl: Relax auxiliary storage ordering requirements with 420pack.
These were already semi-relaxed, since the storage qualifier rule
already skipped when 420pack was enabled.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/glsl/glsl_parser.yy | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index 718531cea8a..b73ec6b3e19 100644 --- a/src/glsl/glsl_parser.yy +++ b/src/glsl/glsl_parser.yy @@ -1419,7 +1419,8 @@ type_qualifier: "Duplicate auxiliary storage qualifier (centroid).\n"); } - if ($2.flags.q.invariant || $2.has_interpolation() || $2.has_layout()) { + if (!state->ARB_shading_language_420pack_enable && + ($2.flags.q.invariant || $2.has_interpolation() || $2.has_layout())) { _mesa_glsl_error(&@1, state, "Auxiliary storage qualifiers must come " "just before storage qualifiers.\n"); } |