[Mesa-dev] [PATCH] glsl: Parse 'layout' as a token with advanced blending or bindless

[Iago Toral]

Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>

On Mon, 2018-02-19 at 21:28 -0800, Kenneth Graunke wrote:
> Both KHR_blend_equation_advanced and ARB_bindless_texture provide
> layout qualifiers, and are exposed in compatibility contexts.  We
> need to parse the layout qualifier as a token in order for those
> to work, but forgot to extend this check.
> 
> ARB_shader_image_load_store would need a similar treatment, but we
> don't expose that in legacy OpenGL contexts.
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105161
> ---
>  src/compiler/glsl/glsl_lexer.ll | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/src/compiler/glsl/glsl_lexer.ll
> b/src/compiler/glsl/glsl_lexer.ll
> index 4b36574b73a..ed7a80a2bb1 100644
> --- a/src/compiler/glsl/glsl_lexer.ll
> +++ b/src/compiler/glsl/glsl_lexer.ll
> @@ -491,6 +491,8 @@ void		return VOID_TOK;
>  
>  layout		{
>  		  if ((yyextra->is_version(140, 300))
> +		      || yyextra->ARB_bindless_texture_enable
> +		      || yyextra->KHR_blend_equation_advanced_enable
>  		      || yyextra->AMD_conservative_depth_enable
>  		      || yyextra->ARB_conservative_depth_enable
>  		      || yyextra-
> >ARB_explicit_attrib_location_enable