From 47a509c0461e1bfb37a5d0ec0ef4bc65150221e1 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 22 Sep 2012 09:30:23 -0600 Subject: 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 (cherry picked from commit 1f586684d62c4f5208d1f3929d067a79ea2140ac) --- src/mesa/main/teximage.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 888c7ad230c..3aecc0fff14 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -3403,13 +3403,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) -- cgit v1.2.1