Mesa (master): gles: Fix glGet(GL_{NUM_, }COMPRESSED_TEXTURE_FORMATS_ARB)

[Adam Jackson]

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

Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Sep  8 13:34:53 2011 -0400

gles: Fix glGet(GL_{NUM_,}COMPRESSED_TEXTURE_FORMATS_ARB)

We'd still accept the GL_PALETTE[48]_* formats in glCompressedTexImage2D,
but they wouldn't be listed if you queried whether they were supported.

Signed-off-by: Adam Jackson <ajax at redhat.com>

---

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

diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index 42bd1ee..390fc53 100644
--- a/src/mesa/main/texcompress.c
+++ b/src/mesa/main/texcompress.c
@@ -259,7 +259,6 @@ _mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats)
          n += 4;
       }
    }
-   return n;
 
 #if FEATURE_ES1 || FEATURE_ES2
    if (formats) {
@@ -278,6 +277,8 @@ _mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats)
       n += 10;
    }
 #endif
+
+   return n;
 }