mesa: Don't expose compressed paletted formats via GL_{NUM_,}COMPRESSED_TEXTURE_FORMATS

Fixes a bug introduced by commit faf5d65.  These formats should only
be exposed in OpenGL ES 1.x.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Cc: Xun Fang <xunx.fang@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=40860

diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index b49d1b1ca1e674b77652594904385ca84382412e..03e05d5ef7b02a8d0dbc16346a0f31f0623b676d 100644 (file)
--- a/src/mesa/main/texcompress.c
+++ b/src/mesa/main/texcompress.c
@@ -264,21 +264,23 @@ _mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats)
       }
    }
 
-#if FEATURE_ES1 || FEATURE_ES2
-   if (formats) {
-      formats[n++] = GL_PALETTE4_RGB8_OES;
-      formats[n++] = GL_PALETTE4_RGBA8_OES;
-      formats[n++] = GL_PALETTE4_R5_G6_B5_OES;
-      formats[n++] = GL_PALETTE4_RGBA4_OES;
-      formats[n++] = GL_PALETTE4_RGB5_A1_OES;
-      formats[n++] = GL_PALETTE8_RGB8_OES;
-      formats[n++] = GL_PALETTE8_RGBA8_OES;
-      formats[n++] = GL_PALETTE8_R5_G6_B5_OES;
-      formats[n++] = GL_PALETTE8_RGBA4_OES;
-      formats[n++] = GL_PALETTE8_RGB5_A1_OES;
-   }
-   else {
-      n += 10;
+#if FEATURE_ES1
+   if (ctx->API == API_OPENGLES) {
+      if (formats) {
+        formats[n++] = GL_PALETTE4_RGB8_OES;
+        formats[n++] = GL_PALETTE4_RGBA8_OES;
+        formats[n++] = GL_PALETTE4_R5_G6_B5_OES;
+        formats[n++] = GL_PALETTE4_RGBA4_OES;
+        formats[n++] = GL_PALETTE4_RGB5_A1_OES;
+        formats[n++] = GL_PALETTE8_RGB8_OES;
+        formats[n++] = GL_PALETTE8_RGBA8_OES;
+        formats[n++] = GL_PALETTE8_R5_G6_B5_OES;
+        formats[n++] = GL_PALETTE8_RGBA4_OES;
+        formats[n++] = GL_PALETTE8_RGB5_A1_OES;
+      }
+      else {
+        n += 10;
+      }
    }
 #endif