[Mesa-dev] [PATCH] glsl: Disable textureOffset(sampler2DArrayShadow, ...) in GLSL ES.
Kenneth Graunke
kenneth at whitecape.org
Sat Oct 15 22:44:07 UTC 2016
This has apparently never existed in GLSL ES.
Fixes dEQP-GLES3.functional.shaders.texture_functions.invalid
.textureoffset_sampler2darrayshadow_vec4_ivec2_vertex and
.textureoffset_sampler2darrayshadow_vec4_ivec2_fragment
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98244
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/compiler/glsl/builtin_functions.cpp | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/compiler/glsl/builtin_functions.cpp b/src/compiler/glsl/builtin_functions.cpp
index ad3d981..3e4bcbb 100644
--- a/src/compiler/glsl/builtin_functions.cpp
+++ b/src/compiler/glsl/builtin_functions.cpp
@@ -123,6 +123,12 @@ v130(const _mesa_glsl_parse_state *state)
}
static bool
+v130_desktop(const _mesa_glsl_parse_state *state)
+{
+ return state->is_version(130, 0);
+}
+
+static bool
v130_fs_only(const _mesa_glsl_parse_state *state)
{
return state->is_version(130, 300) &&
@@ -1808,7 +1814,7 @@ builtin_builder::create_builtins()
* that it was intended to be included previously, so allow it
* in 1.30.
*/
- _texture(ir_tex, v130, glsl_type::float_type, glsl_type::sampler2DArrayShadow_type, glsl_type::vec4_type, TEX_OFFSET),
+ _texture(ir_tex, v130_desktop, glsl_type::float_type, glsl_type::sampler2DArrayShadow_type, glsl_type::vec4_type, TEX_OFFSET),
_texture(ir_txb, v130_fs_only, glsl_type::vec4_type, glsl_type::sampler1D_type, glsl_type::float_type, TEX_OFFSET),
_texture(ir_txb, v130_fs_only, glsl_type::ivec4_type, glsl_type::isampler1D_type, glsl_type::float_type, TEX_OFFSET),
--
2.10.0
More information about the mesa-dev
mailing list