Mesa (master): mesa: move error check code in compressedteximage()

Brian Paul brianp at kemper.freedesktop.org
Sat Apr 16 07:18:57 PDT 2011


Module: Mesa
Branch: master
Commit: af0e2ef8cc5c823e3c950233a09b8de87933a363
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=af0e2ef8cc5c823e3c950233a09b8de87933a363

Author: Brian Paul <brianp at vmware.com>
Date:   Sat Apr 16 08:03:47 2011 -0600

mesa: move error check code in compressedteximage()

This was mistakenly inside the #if FEATURE_ES block.

---

 src/mesa/main/teximage.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index c5c4543..af0b9c7 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -3281,13 +3281,13 @@ compressedteximage(struct gl_context *ctx, GLuint dims,
                                           internalFormat, width, height, depth,
                                           border, imageSize);
 
-#if FEATURE_ES
-   /* XXX this is kind of a hack */
    if (error) {
       _mesa_error(ctx, error, "glTexImage2D");
       return;
    }
 
+#if FEATURE_ES
+   /* XXX this is kind of a hack */
    if (dims == 2) {
       switch (internalFormat) {
       case GL_PALETTE4_RGB8_OES:



More information about the mesa-commit mailing list