[Mesa-dev] [PATCH 09/14] glsl: Disable ordering checks for const parameters with 420pack.

Kenneth Graunke kenneth at whitecape.org
Mon Jul 15 19:32:11 PDT 2013


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

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
---
 src/glsl/glsl_parser.yy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy
index a4ab5a4..97ed6b1 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");
 
-- 
1.8.3.2



More information about the mesa-dev mailing list