summaryrefslogtreecommitdiffstats
path: root/src/compiler/glsl/glsl_parser_extras.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/compiler/glsl/glsl_parser_extras.h')
-rw-r--r--src/compiler/glsl/glsl_parser_extras.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/compiler/glsl/glsl_parser_extras.h b/src/compiler/glsl/glsl_parser_extras.h
index e1144a19c15..985200ecab5 100644
--- a/src/compiler/glsl/glsl_parser_extras.h
+++ b/src/compiler/glsl/glsl_parser_extras.h
@@ -346,13 +346,14 @@ struct _mesa_glsl_parse_state {
bool has_implicit_conversions() const
{
- return is_version(120, 0);
+ return EXT_shader_implicit_conversions_enable || is_version(120, 0);
}
bool has_implicit_uint_to_int_conversion() const
{
return ARB_gpu_shader5_enable ||
MESA_shader_integer_functions_enable ||
+ EXT_shader_implicit_conversions_enable ||
is_version(400, 0);
}
@@ -806,6 +807,8 @@ struct _mesa_glsl_parse_state {
bool EXT_shader_framebuffer_fetch_warn;
bool EXT_shader_framebuffer_fetch_non_coherent_enable;
bool EXT_shader_framebuffer_fetch_non_coherent_warn;
+ bool EXT_shader_implicit_conversions_enable;
+ bool EXT_shader_implicit_conversions_warn;
bool EXT_shader_integer_mix_enable;
bool EXT_shader_integer_mix_warn;
bool EXT_shader_io_blocks_enable;