From f30f48476fd2f441c7aaf001bd8456fe2d5432bf Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Sat, 15 Oct 2016 14:47:31 -0700 Subject: [PATCH] glsl: Disable textureOffset(sampler2DArrayShadow, ...) in GLSL ES. 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 Reviewed-by: Ilia Mirkin --- 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 ad3d981c44b..3e4bcbbd239 100644 --- a/src/compiler/glsl/builtin_functions.cpp +++ b/src/compiler/glsl/builtin_functions.cpp @@ -122,6 +122,12 @@ v130(const _mesa_glsl_parse_state *state) return state->is_version(130, 300); } +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) { @@ -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.30.2