summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2012-09-22 09:30:23 -0600
committerBrian Paul <brianp@vmware.com>2012-09-26 07:43:49 -0600
commit1f586684d62c4f5208d1f3929d067a79ea2140ac (patch)
treeb781a654e626e332898acd8961897e63a79772b0
parent421eeff4636ecc819c118b67136b97f0a922e6fd (diff)
mesa: fix incorrect error for glCompressedSubTexImage
If a subtexture region isn't aligned to the compressed block size, return GL_INVALID_OPERATION, not gl_INVALID_VALUE. NOTE: This is a candidate for the stable branches. Reviewed-by: Eric Anholt <eric@anholt.net>
-rw-r--r--src/mesa/main/teximage.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 08af6689376..c22e853c5de 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -3574,13 +3574,13 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dimensions,
get_compressed_block_size(format, &bw, &bh);
if ((xoffset % bw != 0) || (yoffset % bh != 0))
- return GL_INVALID_VALUE;
+ return GL_INVALID_OPERATION;
if ((width % bw != 0) && width != 2 && width != 1)
- return GL_INVALID_VALUE;
+ return GL_INVALID_OPERATION;
if ((height % bh != 0) && height != 2 && height != 1)
- return GL_INVALID_VALUE;
+ return GL_INVALID_OPERATION;
expectedSize = compressed_tex_size(width, height, depth, format);
if (expectedSize != imageSize)