diff options
author | Gert Wollny <[email protected]> | 2019-02-25 19:12:07 +0100 |
---|---|---|
committer | Gert Wollny <[email protected]> | 2019-03-03 21:50:42 +0100 |
commit | 3214f20914134df07b070f471c0ca2d610ed3b81 (patch) | |
tree | 35cdef9d9a5464dd5daf8c1aa9e2dd7d100f3375 /src/compiler/glsl | |
parent | 7dc2f4788288ec9c7ab63e37fdea750c08503eca (diff) |
mesa: Expose EXT_texture_query_lod and add support for its use shaders
EXT_texture_query_lod provides the same functionality for GLES like
the ARB extension with the same name for GL.
v2: Set ES 3.0 as minimum GLES version as required by the extension
Signed-off-by: Gert Wollny <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/compiler/glsl')
-rw-r--r-- | src/compiler/glsl/builtin_functions.cpp | 3 | ||||
-rw-r--r-- | src/compiler/glsl/glsl_parser_extras.cpp | 1 | ||||
-rw-r--r-- | src/compiler/glsl/glsl_parser_extras.h | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/compiler/glsl/builtin_functions.cpp b/src/compiler/glsl/builtin_functions.cpp index 0f747b94757..aba1a14bd90 100644 --- a/src/compiler/glsl/builtin_functions.cpp +++ b/src/compiler/glsl/builtin_functions.cpp @@ -405,7 +405,8 @@ static bool texture_query_lod(const _mesa_glsl_parse_state *state) { return state->stage == MESA_SHADER_FRAGMENT && - state->ARB_texture_query_lod_enable; + (state->ARB_texture_query_lod_enable || + state->EXT_texture_query_lod_enable); } static bool diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp index bde93dd3f37..fd3e9e55af1 100644 --- a/src/compiler/glsl/glsl_parser_extras.cpp +++ b/src/compiler/glsl/glsl_parser_extras.cpp @@ -730,6 +730,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = { EXT(EXT_texture_array), EXT_AEP(EXT_texture_buffer), EXT_AEP(EXT_texture_cube_map_array), + EXT(EXT_texture_query_lod), EXT(INTEL_conservative_rasterization), EXT(INTEL_shader_atomic_float_minmax), EXT(MESA_shader_integer_functions), diff --git a/src/compiler/glsl/glsl_parser_extras.h b/src/compiler/glsl/glsl_parser_extras.h index b17b5125e0b..f404efd9610 100644 --- a/src/compiler/glsl/glsl_parser_extras.h +++ b/src/compiler/glsl/glsl_parser_extras.h @@ -834,6 +834,8 @@ struct _mesa_glsl_parse_state { bool EXT_texture_buffer_warn; bool EXT_texture_cube_map_array_enable; bool EXT_texture_cube_map_array_warn; + bool EXT_texture_query_lod_enable; + bool EXT_texture_query_lod_warn; bool INTEL_conservative_rasterization_enable; bool INTEL_conservative_rasterization_warn; bool INTEL_shader_atomic_float_minmax_enable; |