Re: [Mesa-dev] [PATCH] glsl: Disable textureOffset(sampler2DArrayShadow, ...) in GLSL ES.

2016-10-15 Thread Ilia Mirkin
Reviewed-by: Ilia Mirkin 

On Sat, Oct 15, 2016 at 6:44 PM, Kenneth Graunke  wrote:
> 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 
> ---
>  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
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH] glsl: Disable textureOffset(sampler2DArrayShadow, ...) in GLSL ES.

2016-10-15 Thread Kenneth Graunke
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 
---
 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

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev