From: Brian Paul <brianp@vmware.com>
Date: Fri, 15 Aug 2014 22:55:40 +0000 (-0600)
Subject: mesa: fix compressed_subtexture_error_check() return value
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9d9879abed5bf99bc7beb9e20ac71a179585ff90;p=mesa.git

mesa: fix compressed_subtexture_error_check() return value

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.

Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 4414a66182a..647d28ab3d1 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);