[Mesa-dev] [PATCH 12/14] glsl: Allow precision qualifiers to be flexibly ordered with 420pack.

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


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

diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy
index e2edacf..f0299fc 100644
--- a/src/glsl/glsl_parser.yy
+++ b/src/glsl/glsl_parser.yy
@@ -908,7 +908,7 @@ parameter_qualifier:
       if ($2.precision != ast_precision_none)
          _mesa_glsl_error(&@1, state, "Duplicate precision qualifier.\n");
 
-      if ($2.flags.i != 0)
+      if (!state->ARB_shading_language_420pack_enable && $2.flags.i != 0)
          _mesa_glsl_error(&@1, state, "Precision qualifiers must come last.\n");
 
       $$ = $2;
@@ -1433,7 +1433,7 @@ type_qualifier:
       if ($2.precision != ast_precision_none)
          _mesa_glsl_error(&@1, state, "Duplicate precision qualifier.\n");
 
-      if ($2.flags.i != 0)
+      if (!state->ARB_shading_language_420pack_enable && $2.flags.i != 0)
          _mesa_glsl_error(&@1, state, "Precision qualifiers must come last.\n");
 
       $$ = $2;
-- 
1.8.3.2



More information about the mesa-dev mailing list