From: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon, 19 Aug 2013 21:27:31 +0000 (-0700)
Subject: mesa: Never advertise _S3TC compressed formats
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f53b634807140268b40b063a2a966ad2701df7be;p=mesa.git

mesa: Never advertise _S3TC compressed formats

The NVIDIA driver doesn't expose them, and piglit's
arb_texture_compression-invalid-formats expects them to not be there.

This, with the previous commit, fixes piglit
arb_texture_compression-invalid-formats.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
Cc: "9.2" <mesa-stable@lists.freedesktop.org>
---

diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index 334ea4068d9..e71d0c411da 100644
--- a/src/mesa/main/texcompress.c
+++ b/src/mesa/main/texcompress.c
@@ -264,18 +264,6 @@ _mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats)
          n += 3;
       }
    }
-   if (_mesa_is_desktop_gl(ctx)
-       && ctx->Extensions.ANGLE_texture_compression_dxt) {
-      if (formats) {
-         formats[n++] = GL_RGB_S3TC;
-         formats[n++] = GL_RGB4_S3TC;
-         formats[n++] = GL_RGBA_S3TC;
-         formats[n++] = GL_RGBA4_S3TC;
-      }
-      else {
-         n += 4;
-      }
-   }
 
    /* The GL_OES_compressed_ETC1_RGB8_texture spec says:
     *