From: Dave Airlie Date: Tue, 3 May 2016 06:44:20 +0000 (+1000) Subject: glsl: resource is a reserved keyword in GLSL 4.20 as well X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3110a0aa2304616bf996fdf019ad4457bed44dfd;p=mesa.git glsl: resource is a reserved keyword in GLSL 4.20 as well resource just appears in GLSL 4.20 without any fanfare. Fixes GL43-CTX.CommonBugs.CommonBug_ReservedNames Reviewed-by: Iago Toral Quiroga Signed-off-by: Dave Airlie --- diff --git a/src/compiler/glsl/glsl_lexer.ll b/src/compiler/glsl/glsl_lexer.ll index 8a562cbcb00..11711eea231 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);