summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Jackson <[email protected]>2011-09-08 13:34:53 -0400
committerAdam Jackson <[email protected]>2011-09-08 13:40:06 -0400
commitfaf5d6584b9d75a10987c4460b376af7d1e4d496 (patch)
treecc412ed796ccc85a73b42fa69e4b7e49a870a5c6 /src
parentb453ba2c9f8ccb1d61a0ef50f0a40592df3366c3 (diff)
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 <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/texcompress.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index 42bd1eee5ca..390fc535e92 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;
}