From: Chris Forbes <chr...@ijw.co.nz>
---
src/compiler/glsl/glsl_lexer.ll | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/compiler/glsl/glsl_lexer.ll b/src/compiler/glsl/glsl_lexer.ll
index 87b64e09c16..e24bb133bc2 100644
--- a/src/compiler/glsl/glsl_lexer.ll
+++ b/src/compiler/glsl/glsl_lexer.ll
@@ -372,25 +372,25 @@ mat3x4 TYPE(120, 300, 120, 300,
glsl_type::mat3x4_type);
mat4x2 TYPE(120, 300, 120, 300, glsl_type::mat4x2_type);
mat4x3 TYPE(120, 300, 120, 300, glsl_type::mat4x3_type);
mat4x4 TYPE(120, 300, 120, 300, glsl_type::mat4_type);
in return IN_TOK;
out return OUT_TOK;
inout return INOUT_TOK;
uniform return UNIFORM;
buffer KEYWORD_WITH_ALT(0, 0, 430, 310,
yyextra->ARB_shader_storage_buffer_object_enable, BUFFER);
varying DEPRECATED_ES_KEYWORD(VARYING);
-centroid KEYWORD(120, 300, 120, 300, CENTROID);
+centroid KEYWORD_WITH_ALT(120, 300, 120, 300,
yyextra->EXT_gpu_shader4_enable, CENTROID);
invariant KEYWORD(120, 100, 120, 100, INVARIANT);
-flat KEYWORD(130, 100, 130, 300, FLAT);
+flat KEYWORD_WITH_ALT(130, 100, 130, 300,
yyextra->EXT_gpu_shader4_enable, FLAT);
smooth KEYWORD(130, 300, 130, 300, SMOOTH);
-noperspective KEYWORD(130, 300, 130, 0, NOPERSPECTIVE);
+noperspective KEYWORD_WITH_ALT(130, 300, 130, 0,
yyextra->EXT_gpu_shader4_enable, NOPERSPECTIVE);
patch KEYWORD_WITH_ALT(0, 300, 400, 320,
yyextra->has_tessellation_shader(), PATCH);
sampler1D DEPRECATED_ES_TYPE(glsl_type::sampler1D_type);
sampler2D { yylval->type = glsl_type::sampler2D_type; return
BASIC_TYPE_TOK; }
sampler3D { yylval->type = glsl_type::sampler3D_type; return
BASIC_TYPE_TOK; }
samplerCube { yylval->type = glsl_type::samplerCube_type; return
BASIC_TYPE_TOK; }
sampler1DArray TYPE(130, 300, 130, 0, glsl_type::sampler1DArray_type);
sampler2DArray TYPE(130, 300, 130, 300, glsl_type::sampler2DArray_type);
sampler1DShadow DEPRECATED_ES_TYPE(glsl_type::sampler1DShadow_type);
sampler2DShadow { yylval->type = glsl_type::sampler2DShadow_type;
return BASIC_TYPE_TOK; }
--
2.17.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
