[Mesa-dev] [PATCH 2/2] es3: Don't check dimensions in _mesa_es3_error_check_format_and_type

[Anuj Phogat]

On Thu, Jan 17, 2013 at 5:06 AM, Ian Romanick <idr at freedesktop.org> wrote:
> From: Ian Romanick <ian.d.romanick at intel.com>
>
> Filtering of DEPTH_COMPONENT and DEPTH_STENCIL for TEXTURE_3D is already
> done in texture_error_check because these combinations aren't allowed on
> desktop GL either.
>
> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
> ---
>  src/mesa/main/glformats.c | 9 +--------
>  src/mesa/main/glformats.h | 3 +--
>  src/mesa/main/teximage.c  | 3 +--
>  3 files changed, 3 insertions(+), 12 deletions(-)
>
> diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
> index 7969f77..3004c08 100644
> --- a/src/mesa/main/glformats.c
> +++ b/src/mesa/main/glformats.c
> @@ -1697,8 +1697,7 @@ _mesa_es_error_check_format_and_type(GLenum format, GLenum type,
>   */
>  GLenum
>  _mesa_es3_error_check_format_and_type(GLenum format, GLenum type,
> -                                      GLenum internalFormat,
> -                                      unsigned dimensions)
> +                                      GLenum internalFormat)
>  {
>     GLboolean type_valid = GL_TRUE;
>
> @@ -2068,9 +2067,6 @@ _mesa_es3_error_check_format_and_type(GLenum format, GLenum type,
>        break;
>
>     case GL_DEPTH_COMPONENT:
> -      if (dimensions != 2) {
> -         return GL_INVALID_OPERATION;
> -      }
>        switch (type) {
>        case GL_UNSIGNED_SHORT:
>           if (internalFormat != GL_DEPTH_COMPONENT16)
> @@ -2098,9 +2094,6 @@ _mesa_es3_error_check_format_and_type(GLenum format, GLenum type,
>        break;
>
>     case GL_DEPTH_STENCIL:
> -      if (dimensions != 2) {
> -         return GL_INVALID_OPERATION;
> -      }
>        switch (type) {
>        case GL_UNSIGNED_INT_24_8:
>           if (internalFormat != GL_DEPTH24_STENCIL8)
> diff --git a/src/mesa/main/glformats.h b/src/mesa/main/glformats.h
> index 4cbc82f..cdd2b94 100644
> --- a/src/mesa/main/glformats.h
> +++ b/src/mesa/main/glformats.h
> @@ -122,8 +122,7 @@ _mesa_es_error_check_format_and_type(GLenum format, GLenum type,
>
>  extern GLenum
>  _mesa_es3_error_check_format_and_type(GLenum format, GLenum type,
> -                                      GLenum internalFormat,
> -                                      unsigned dimensions);
> +                                      GLenum internalFormat);
>
>
>  #ifdef __cplusplus
> diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
> index 7a15196..c44a4f5 100644
> --- a/src/mesa/main/teximage.c
> +++ b/src/mesa/main/teximage.c
> @@ -1896,8 +1896,7 @@ texture_error_check( struct gl_context *ctx,
>     if (_mesa_is_gles(ctx)) {
>        if (_mesa_is_gles3(ctx)) {
>           err = _mesa_es3_error_check_format_and_type(format, type,
> -                                                     internalFormat,
> -                                                     dimensions);
> +                                                     internalFormat);
>        } else {
>           if (format != internalFormat) {
>           _mesa_error(ctx, GL_INVALID_OPERATION,
> --
> 1.7.11.7
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Both patches are Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>