summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2013-07-15 17:02:21 -0700
committerKenneth Graunke <kenneth@whitecape.org>2013-07-18 16:57:22 -0700
commit7855482138480d88e7ca167d2acca9b93fe011b9 (patch)
tree97527ab67135b39fac3eed3518ea870713591d87
parent293dfe5738019d0f8367e68f0b74e438482c9d82 (diff)
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>
-rw-r--r--src/glsl/glsl_parser.yy2
1 files changed, 1 insertions, 1 deletions
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");