These were already semi-relaxed, since the storage qualifier rule already skipped when 420pack was enabled.
Signed-off-by: Kenneth Graunke <kenn...@whitecape.org> --- 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 e6b82b0..3867cf8 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"); } -- 1.8.3.2 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev