diff options
| author | Ian Romanick <[email protected]> | 2015-04-28 12:50:51 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2015-05-04 13:49:58 -0700 |
| commit | ad14f44b3e89cf4d05d29f2aaf9f64fe0e42af3b (patch) | |
| tree | dc7cf71bd1608bbdbb3f18a6d7e0a882be6afbe2 /src/glsl/builtin_functions.cpp | |
| parent | dd61475d56f3b94c3586889333931ebe50a32c3e (diff) | |
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 <[email protected]>
Reviewed-by: Tapani Pälli <[email protected]>
Reviewed-by: Ilia Mirkin <[email protected]> [v1]
Diffstat (limited to 'src/glsl/builtin_functions.cpp')
| -rw-r--r-- | src/glsl/builtin_functions.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp index 5ce811289d1..435d926c660 100644 --- a/src/glsl/builtin_functions.cpp +++ b/src/glsl/builtin_functions.cpp @@ -194,7 +194,8 @@ shader_bit_encoding(const _mesa_glsl_parse_state *state) static bool shader_integer_mix(const _mesa_glsl_parse_state *state) { - return v130(state) && state->EXT_shader_integer_mix_enable; + return state->is_version(450, 310) || + v130(state) && state->EXT_shader_integer_mix_enable; } static bool |