[Mesa-dev] [PATCH] glsl: OpenGLES GLSL 3.1 precision qualifiers ordering rules

[Lofstedt, Marta]

Reviewed-by: Marta Lofstedt <marta.lofstedt at intel.com>


> -----Original Message-----
> From: mesa-dev [mailto:mesa-dev-bounces at lists.freedesktop.org] On
> Behalf Of Jordan Justen
> Sent: Thursday, October 29, 2015 8:47 AM
> To: mesa-dev at lists.freedesktop.org
> Subject: [Mesa-dev] [PATCH] glsl: OpenGLES GLSL 3.1 precision qualifiers
> ordering rules
> 
> The OpenGLES GLSL 3.1 specification uses the precision qualifier ordering
> rules from ARB_shading_language_420pack.
> 
> Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
> ---
>  src/glsl/glsl_parser.yy | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index
> 2f2e10d..4636435 100644
> --- a/src/glsl/glsl_parser.yy
> +++ b/src/glsl/glsl_parser.yy
> @@ -948,7 +948,8 @@ parameter_qualifier:
>        if ($2.precision != ast_precision_none)
>           _mesa_glsl_error(&@1, state, "duplicate precision qualifier");
> 
> -      if (!state->has_420pack() && $2.flags.i != 0)
> +      if (!(state->has_420pack() || state->is_version(420, 310)) &&
> +          $2.flags.i != 0)
>           _mesa_glsl_error(&@1, state, "precision qualifiers must come last");
> 
>        $$ = $2;
> @@ -1847,7 +1848,8 @@ type_qualifier:
>        if ($2.precision != ast_precision_none)
>           _mesa_glsl_error(&@1, state, "duplicate precision qualifier");
> 
> -      if (!state->has_420pack() && $2.flags.i != 0)
> +      if (!(state->has_420pack() || state->is_version(420, 310)) &&
> +          $2.flags.i != 0)
>           _mesa_glsl_error(&@1, state, "precision qualifiers must come last");
> 
>        $$ = $2;
> --
> 2.5.1
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev