From: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue, 16 Jul 2013 00:02:21 +0000 (-0700)
Subject: glsl: Disable ordering checks for const parameters with 420pack.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7855482138480d88e7ca167d2acca9b93fe011b9;p=mesa.git

glsl: Disable ordering checks for const parameters with 420pack.

This makes the complier accept both "const in" and "in const".

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 1ce28e2e121..ff57c29741f 100644
--- a/src/glsl/glsl_parser.yy
+++ b/src/glsl/glsl_parser.yy
@@ -898,7 +898,7 @@ parameter_qualifier:
       if (($1.flags.q.in || $1.flags.q.out) && ($2.flags.q.in || $2.flags.q.out))
          _mesa_glsl_error(&@1, state, "duplicate in/out/inout qualifier\n");
 
-      if ($2.flags.q.constant)
+      if (!state->ARB_shading_language_420pack_enable && $2.flags.q.constant)
          _mesa_glsl_error(&@1, state, "const must be specified before "
                           "in/out/inout.\n");