mesa: use _mesa_base_format_has_channel() in fbobject.c queries

[mesa.git] / src / mesa / main / texcompress.c

diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index b49d1b1ca1e674b77652594904385ca84382412e..0458b9b689ef1786905cd9a4756c0298f95f99ca 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
 
@@ -459,8 +461,8 @@ _mesa_decompress_image(gl_format format, GLuint width, GLuint height,
 
    /* setup dummy texture image info */
    memset(&texImage, 0, sizeof(texImage));
-   texImage.Base.Data = (void *) src;
-   texImage.Base.RowStride = srcRowStride;
+   texImage.Data = (void *) src;
+   texImage.RowStride = srcRowStride;
 
    switch (format) {
    /* DXT formats */