From 89efc1b839591473d0a448dc1087a5deb56579c7 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 1 Dec 2011 16:37:49 -0700 Subject: [PATCH] mesa: move _mesa_error() call in compressedteximage() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We shouldn't call _mesa_error() if the target is a proxy texture. Errors are handled later in the function. Fixes a Coverity warning. Reviewed-by: José Fonseca --- src/mesa/main/teximage.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 2bdcedc8c13..99905de3adb 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -3361,14 +3361,9 @@ compressedteximage(struct gl_context *ctx, GLuint dims, internalFormat, width, height, depth, border, imageSize, &reason); - if (error) { - _mesa_error(ctx, error, "glCompressedTexImage%uD(%s)", dims, reason); - return; - } - #if FEATURE_ES /* XXX this is kind of a hack */ - if (dims == 2) { + if (!error && dims == 2) { switch (internalFormat) { case GL_PALETTE4_RGB8_OES: case GL_PALETTE4_RGBA8_OES: @@ -3422,7 +3417,7 @@ compressedteximage(struct gl_context *ctx, GLuint dims, struct gl_texture_image *texImage; if (error) { - _mesa_error(ctx, error, "glCompressedTexImage%uD", dims); + _mesa_error(ctx, error, "glCompressedTexImage%uD(%s)", dims, reason); return; } -- 2.30.2