From: Marek Olšák <maraeo@gmail.com>
Date: Tue, 4 May 2010 18:09:53 +0000 (+0200)
Subject: r300g: advertise S3TC only when it's available in Gallium
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=88512e837e45b72c33a7d28ccf02f00580a4cf10;p=mesa.git

r300g: advertise S3TC only when it's available in Gallium
---

diff --git a/src/gallium/drivers/r300/r300_texture.c b/src/gallium/drivers/r300/r300_texture.c
index d6f629cf9c6..a6f65fce216 100644
--- a/src/gallium/drivers/r300/r300_texture.c
+++ b/src/gallium/drivers/r300/r300_texture.c
@@ -24,6 +24,7 @@
 #include "pipe/p_screen.h"
 
 #include "util/u_format.h"
+#include "util/u_format_s3tc.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
 
@@ -170,6 +171,10 @@ uint32_t r300_translate_texformat(enum pipe_format format,
 
     /* S3TC formats. */
     if (desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
+        if (!util_format_s3tc_enabled) {
+            return ~0; /* Unsupported. */
+        }
+
         switch (format) {
             case PIPE_FORMAT_DXT1_RGB:
             case PIPE_FORMAT_DXT1_RGBA: