From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 18 Jul 2013 23:31:05 +0000 (-0700)
Subject: glsl: Allow duplicate layout qualifiers with 420pack.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0cb90fcfbde5369f76c2e24b9fa2cbfc4f7557fc;p=mesa.git

glsl: Allow duplicate layout qualifiers with 420pack.

The new 4.20 rules explicitly allow multiple layout(...) sections.

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 c31f5e26481..381fa2b5289 100644
--- a/src/glsl/glsl_parser.yy
+++ b/src/glsl/glsl_parser.yy
@@ -1385,7 +1385,7 @@ type_qualifier:
        * appear to be any text indicating that it must come before the storage
        * qualifier, but always seems to in examples.
        */
-      if ($2.has_layout())
+      if (!state->ARB_shading_language_420pack_enable && $2.has_layout())
          _mesa_glsl_error(&@1, state, "Duplicate layout(...) qualifiers.\n");
 
       if ($2.flags.q.invariant)