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 <kenneth@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>

diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy
index 718531cea8a7a24aa182b8ee15b032352bb55785..b73ec6b3e19666d3426e52c0205dc178009a8f6b 100644 (file)
--- 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");
       }