[Mesa-dev] [PATCH 3/3] mesa: fix compressed_subtexture_error_check() return value
Brian Paul
brianp at vmware.com
Fri Aug 15 16:04:14 PDT 2014
The function should return GLboolean, not GLenum.
If we detect invalid compressed pixel storage parameters, we should
return GL_TRUE, not GL_FALSE so that the function is no-op'd.
An update to the piglit s3tc-errors test will check this.
---
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 4414a66..647d28a 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -4182,9 +4182,9 @@ out:
/**
* Error checking for glCompressedTexSubImage[123]D().
- * \return error code or GL_NO_ERROR.
+ * \return GL_TRUE if error, GL_FALSE if no error
*/
-static GLenum
+static GLboolean
compressed_subtexture_error_check(struct gl_context *ctx, GLint dims,
GLenum target, GLint level,
GLint xoffset, GLint yoffset, GLint zoffset,
@@ -4246,7 +4246,7 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dims,
if (!_mesa_compressed_pixel_storage_error_check(ctx, dims,
&ctx->Unpack,
"glCompressedTexSubImage")) {
- return GL_FALSE;
+ return GL_TRUE;
}
expectedSize = compressed_tex_size(width, height, depth, format);
--
1.7.10.4
More information about the mesa-dev
mailing list