[Mesa-dev] [PATCH] mesa: add missing texture integer test in glTexSubImage()

[Eric Anholt]

On Wed, 15 Feb 2012 15:41:01 -0700, Brian Paul <brianp at vmware.com> wrote:
> If the texture format is integer, the incoming user data must also be
> integer (and similarly for non-integer textures).
> 
> NOTE: This is a candidate for the stable branches.
> ---
>  src/mesa/main/teximage.c |   11 +++++++++++
>  1 files changed, 11 insertions(+), 0 deletions(-)
> 
> diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
> index e4eb7f6..a3ffb01 100644
> --- a/src/mesa/main/teximage.c
> +++ b/src/mesa/main/teximage.c
> @@ -1852,6 +1852,17 @@ subtexture_error_check2( struct gl_context *ctx, GLuint dimensions,
>        }         
>     }
>  
> +   if (ctx->VersionMajor >= 3 || ctx->Extensions.EXT_texture_integer) {
> +      /* both source and dest must be integer-valued, or neither */
> +      if (_mesa_is_format_integer_color(destTex->TexFormat) !=
> +          _mesa_is_integer_format(format)) {
> +         _mesa_error(ctx, GL_INVALID_OPERATION,
> +                     "glTexSubImage%d(integer/non-integer format mismatch)",
> +                     dimensions);
> +         return GL_TRUE;
> +      }
> +   }
> +

Reviewed-by: Eric Anholt <eric at anholt.net>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20120216/13319681/attachment.pgp>