summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2010-11-11 14:26:52 +0000
committerKeith Whitwell <[email protected]>2010-11-11 14:30:09 +0000
commit6baad55f157387d0bb44144680a96bc32280109f (patch)
tree175487d3aa51940b538136dfe58e7e69c71b4519 /src/gallium
parent089056a5f327debb9df11c83742c5bf7a5a90c81 (diff)
r600g: guard experimental s3tc code with R600_ENABLE_S3TC
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/r600/r600_texture.c9
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 ef5adaf6487..a590858c852 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: