glsl: Allow precision qualifiers to be flexibly ordered with 420pack.

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 08806a32bcf33eb7482cab3c0e8a0e6d15bea66f..5a7db874df224d4e62c57346b66dd9fb5cbecf1b 100644 (file)
--- a/src/glsl/glsl_parser.yy
+++ b/src/glsl/glsl_parser.yy
@@ -908,7 +908,7 @@ parameter_qualifier:
       if ($2.precision != ast_precision_none)
          _mesa_glsl_error(&@1, state, "Duplicate precision qualifier.\n");
 
-      if ($2.flags.i != 0)
+      if (!state->ARB_shading_language_420pack_enable && $2.flags.i != 0)
          _mesa_glsl_error(&@1, state, "Precision qualifiers must come last.\n");
 
       $$ = $2;
@@ -1433,7 +1433,7 @@ type_qualifier:
       if ($2.precision != ast_precision_none)
          _mesa_glsl_error(&@1, state, "Duplicate precision qualifier.\n");
 
-      if ($2.flags.i != 0)
+      if (!state->ARB_shading_language_420pack_enable && $2.flags.i != 0)
          _mesa_glsl_error(&@1, state, "Precision qualifiers must come last.\n");
 
       $$ = $2;