diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2015-04-28 12:50:51 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2015-05-04 13:49:58 -0700 |
| commit | ad14f44b3e89cf4d05d29f2aaf9f64fe0e42af3b (patch) | |
| tree | dc7cf71bd1608bbdbb3f18a6d7e0a882be6afbe2 /src/glsl/glsl_lexer.ll | |
| parent | dd61475d56f3b94c3586889333931ebe50a32c3e (diff) | |
| download | external_mesa3d-ad14f44b3e89cf4d05d29f2aaf9f64fe0e42af3b.zip external_mesa3d-ad14f44b3e89cf4d05d29f2aaf9f64fe0e42af3b.tar.gz external_mesa3d-ad14f44b3e89cf4d05d29f2aaf9f64fe0e42af3b.tar.bz2 | |
glsl/es3.1: Allow interger mix built-ins in GLSL ES 3.10
v2: Add missing lexer support. Noticed by Tapani.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu> [v1]
Diffstat (limited to 'src/glsl/glsl_lexer.ll')
| -rw-r--r-- | src/glsl/glsl_lexer.ll | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll index 2785ed1..10db5b8 100644 --- a/src/glsl/glsl_lexer.ll +++ b/src/glsl/glsl_lexer.ll @@ -409,7 +409,7 @@ restrict KEYWORD_WITH_ALT(420, 300, 420, 0, yyextra->ARB_shader_image_load_store readonly KEYWORD_WITH_ALT(420, 300, 420, 0, yyextra->ARB_shader_image_load_store_enable, READONLY); writeonly KEYWORD_WITH_ALT(420, 300, 420, 0, yyextra->ARB_shader_image_load_store_enable, WRITEONLY); -atomic_uint KEYWORD_WITH_ALT(420, 300, 420, 0, yyextra->ARB_shader_atomic_counters_enable, ATOMIC_UINT); +atomic_uint KEYWORD_WITH_ALT(420, 300, 420, 310, yyextra->ARB_shader_atomic_counters_enable, ATOMIC_UINT); struct return STRUCT; void return VOID_TOK; |