Attachment 51205 Details for Bug 40860 – mesa: Don't expose compressed paletted formats via GL_{NUM_,}COMPRESSED_TEXTURE_FORMATS

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

0001-mesa-Don-t-expose-compressed-paletted-formats-via-GL.patch (text/plain), 1.88 KB, created by Ian Romanick on 2011-09-14 09:54:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Romanick

Created: 2011-09-14 09:54:30 UTC

Size: 1.88 KB

patch

obsolete

>From b48fe9b34124b11e6cf28ba242650a56720068d3 Mon Sep 17 00:00:00 2001
>From: Ian Romanick <ian.d.romanick@intel.com>
>Date: Wed, 14 Sep 2011 11:49:09 -0500
>Subject: [PATCH] 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>
>---
> src/mesa/main/texcompress.c |   32 +++++++++++++++++---------------
> 1 files changed, 17 insertions(+), 15 deletions(-)
>
>diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
>index 4e5c14c..96b2fc2 100644
>--- a/src/mesa/main/texcompress.c
>+++ b/src/mesa/main/texcompress.c
>@@ -263,21 +263,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
> 
>-- 
>1.7.6
>

Actions: View | Splinter Review

Attachments on bug 40860: 51205

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.