[Mesa-dev] [PATCH 2/2] glsl: Remove textureGradOffset built-ins taking samplerCube parameters.

[Paul Berry]

On 9 November 2011 22:07, Kenneth Graunke <kenneth at whitecape.org> wrote:

> These simply don't exist in the 1.30 specification---none of the Offset
> variants allow samplerCube.  This must have been a cut and paste error
> from textureGrad, which /does/ allow cubemaps.
>
> Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
> ---
>  src/glsl/builtins/profiles/130.frag         |    4 ----
>  src/glsl/builtins/profiles/130.vert         |    4 ----
>  src/glsl/builtins/tools/texture_builtins.py |    1 -
>  3 files changed, 0 insertions(+), 9 deletions(-)
>
> diff --git a/src/glsl/builtins/profiles/130.frag
> b/src/glsl/builtins/profiles/130.frag
> index 91913ea..bc0fede 100644
> --- a/src/glsl/builtins/profiles/130.frag
> +++ b/src/glsl/builtins/profiles/130.frag
> @@ -884,10 +884,6 @@ uvec4 textureGradOffset(usampler2D s, vec2 P, vec2
> dx, vec2 dy, ivec2 offset);
>  ivec4 textureGradOffset(isampler3D s, vec3 P, vec3 dx, vec3 dy, ivec3
> offset);
>  uvec4 textureGradOffset(usampler3D s, vec3 P, vec3 dx, vec3 dy, ivec3
> offset);
>
> - vec4 textureGradOffset( samplerCube s, vec3 P, vec3 dx, vec3 dy, ivec3
> offset);
> -ivec4 textureGradOffset(isamplerCube s, vec3 P, vec3 dx, vec3 dy, ivec3
> offset);
> -uvec4 textureGradOffset(usamplerCube s, vec3 P, vec3 dx, vec3 dy, ivec3
> offset);
> -
>  float textureGradOffset(sampler1DShadow s, vec3 P, float dx, float dy,
> int off);
>  float textureGradOffset(sampler2DShadow s, vec3 P, vec2 dx, vec2 dy,
> ivec2 off);
>
> diff --git a/src/glsl/builtins/profiles/130.vert
> b/src/glsl/builtins/profiles/130.vert
> index df629a6..35585d5 100644
> --- a/src/glsl/builtins/profiles/130.vert
> +++ b/src/glsl/builtins/profiles/130.vert
> @@ -785,10 +785,6 @@ uvec4 textureGradOffset(usampler2D s, vec2 P, vec2
> dx, vec2 dy, ivec2 offset);
>  ivec4 textureGradOffset(isampler3D s, vec3 P, vec3 dx, vec3 dy, ivec3
> offset);
>  uvec4 textureGradOffset(usampler3D s, vec3 P, vec3 dx, vec3 dy, ivec3
> offset);
>
> - vec4 textureGradOffset( samplerCube s, vec3 P, vec3 dx, vec3 dy, ivec3
> offset);
> -ivec4 textureGradOffset(isamplerCube s, vec3 P, vec3 dx, vec3 dy, ivec3
> offset);
> -uvec4 textureGradOffset(usamplerCube s, vec3 P, vec3 dx, vec3 dy, ivec3
> offset);
> -
>  float textureGradOffset(sampler1DShadow s, vec3 P, float dx, float dy,
> int off);
>  float textureGradOffset(sampler2DShadow s, vec3 P, vec2 dx, vec2 dy,
> ivec2 off);
>
> diff --git a/src/glsl/builtins/tools/texture_builtins.py
> b/src/glsl/builtins/tools/texture_builtins.py
> index 62bad70..586e206 100755
> --- a/src/glsl/builtins/tools/texture_builtins.py
> +++ b/src/glsl/builtins/tools/texture_builtins.py
> @@ -313,7 +313,6 @@ def generate_texture_functions(fs):
>     generate_fiu_sigs("txd", "1D", Offset)
>     generate_fiu_sigs("txd", "2D", Offset)
>     generate_fiu_sigs("txd", "3D", Offset)
> -    generate_fiu_sigs("txd", "Cube", Offset)
>     generate_fiu_sigs("txd", "1DArray", Offset)
>     generate_fiu_sigs("txd", "2DArray", Offset)
>     generate_sigs("", "txd", "1DShadow", Offset | Single, 1);
> --
> 1.7.7.2
>

Reviewed-by: Paul Berry <stereotype441 at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20111110/eeea0bea/attachment-0001.htm>