From 6f3d91840945fbd9221a247e4f95b32c4051f202 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 15 Feb 2012 15:29:29 -0700 Subject: [PATCH] mesa: add missing texture integer test in glTexSubImage() 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. Reviewed-by: Yuanhan Liu Reviewed-by: Eric Anholt --- src/mesa/main/teximage.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index e4eb7f67d1f..6acff240e45 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%dD(integer/non-integer format mismatch)", + dimensions); + return GL_TRUE; + } + } + return GL_FALSE; } -- 2.30.2