summaryrefslogtreecommitdiffstats
path: root/src/compiler/glsl/glsl_parser_extras.h
diff options
context:
space:
mode:
authorErik Faye-Lund <[email protected]>2018-10-25 16:40:13 +0200
committerErik Faye-Lund <[email protected]>2018-11-02 11:10:36 +0100
commit6df922f4384b05f259bc836fc6d626e5c8fe6468 (patch)
tree90797145f6a4363a24ace91e3874ebc17931e6ae /src/compiler/glsl/glsl_parser_extras.h
parentecab2d6f1481e1e50b20b54ae88dd949c1dafab6 (diff)
mesa/glsl: add support for EXT_shader_implicit_conversions
EXT_shader_implicit_conversions adds support for implicit conversions for GLES 3.1 and above. This is essentially a subset of ARB_gpu_shader5, and augments OES_gpu_shader5. Signed-off-by: Erik Faye-Lund <[email protected]> Reviewed-by: Tapani Pälli <[email protected]>
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;