From c397ec94e9a54521a873e84867268c40c73db79c Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Mon, 15 Jul 2013 19:01:28 -0700 Subject: [PATCH] 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 Reviewed-by: Matt Turner --- src/glsl/glsl_parser.yy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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"); } -- 2.30.2