Mesa (master): r600g: guard experimental s3tc code with R600_ENABLE_S3TC

[Keith Whitwell]

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

Author: Keith Whitwell <keithw at vmware.com>
Date:   Thu Nov 11 14:26:52 2010 +0000

r600g: guard experimental s3tc code with R600_ENABLE_S3TC

---

 src/gallium/drivers/r600/r600_texture.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index ef5adaf..a590858 100644
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -832,6 +832,15 @@ uint32_t r600_translate_texformat(enum pipe_format format,
 
 	/* S3TC formats. TODO */
 	if (desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
+                static int r600_enable_s3tc = -1;
+
+                if (r600_enable_s3tc == -1)
+                        r600_enable_s3tc = 
+                                debug_get_bool_option("R600_ENABLE_S3TC", FALSE);
+
+                if (!r600_enable_s3tc)
+                        goto out_unknown;
+
 		switch (format) {
 		case PIPE_FORMAT_DXT1_RGB:
 		case PIPE_FORMAT_DXT1_RGBA: