Mesa (master): st/mesa: do not advertise S3TC if the external lib is not available

[Marek Olšák]

Module: Mesa
Branch: master
Commit: aa4d47f68f992f8bbe843822c9f75dce9e8706f8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=aa4d47f68f992f8bbe843822c9f75dce9e8706f8

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sat Feb 27 03:20:58 2010 +0100

st/mesa: do not advertise S3TC if the external lib is not available

---

 src/mesa/state_tracker/st_extensions.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index d5f5854..e9ee655 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -299,8 +299,12 @@ void st_init_extensions(struct st_context *st)
 
    /* s3tc support */
    if (screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA,
-                                   PIPE_TEXTURE_2D, 
-                                   PIPE_TEXTURE_USAGE_SAMPLER, 0)) {
+                                   PIPE_TEXTURE_2D,
+                                   PIPE_TEXTURE_USAGE_SAMPLER, 0) &&
+       (ctx->Mesa_DXTn ||
+        screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA,
+                                    PIPE_TEXTURE_2D,
+                                    PIPE_TEXTURE_USAGE_RENDER_TARGET, 0))) {
       ctx->Extensions.EXT_texture_compression_s3tc = GL_TRUE;
       ctx->Extensions.S3_s3tc = GL_TRUE;
    }