fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: fix compressed_subtexture_error_check() return value

Browse source 
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>
This commit is contained in:
Brian Paul 2014-08-15 16:55:40 -06:00
parent cf8b680f40
commit 9d9879abed
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/main/teximage.c
View file

@ -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);