[Mesa-dev] [PATCH] glsl: resource is a reserved keyword in GLSL 4.20 as well

[Iago Toral]

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

On Tue, 2016-05-03 at 16:47 +1000, Dave Airlie wrote:
> From: Dave Airlie <airlied at redhat.com>
> 
> resource just appears in GLSL 4.20 without any fanfare.
> 
> Fixes GL43-CTX.CommonBugs.CommonBug_ReservedNames
> 
> Signed-off-by: Dave Airlie <airlied at redhat.com>
> ---
>  src/compiler/glsl/glsl_lexer.ll | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/compiler/glsl/glsl_lexer.ll b/src/compiler/glsl/glsl_lexer.ll
> index 8a562cb..11711ee 100644
> --- a/src/compiler/glsl/glsl_lexer.ll
> +++ b/src/compiler/glsl/glsl_lexer.ll
> @@ -583,7 +583,7 @@ isamplerBuffer	KEYWORD_WITH_ALT(140, 300, 140, 320, yyextra->EXT_texture_buffer_
>  usamplerBuffer	KEYWORD_WITH_ALT(140, 300, 140, 320, yyextra->EXT_texture_buffer_enable || yyextra->OES_texture_buffer_enable, USAMPLERBUFFER);
>  
>      /* Additional reserved words in GLSL ES 3.00 */
> -resource	KEYWORD(0, 300, 0, 0, RESOURCE);
> +resource	KEYWORD(420, 300, 0, 0, RESOURCE);
>  sample		KEYWORD_WITH_ALT(400, 300, 400, 320, yyextra->ARB_gpu_shader5_enable || yyextra->OES_shader_multisample_interpolation_enable, SAMPLE);
>  subroutine	KEYWORD_WITH_ALT(400, 300, 400, 0, yyextra->ARB_shader_subroutine_enable, SUBROUTINE);
>