From 6baad55f157387d0bb44144680a96bc32280109f Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Thu, 11 Nov 2010 14:26:52 +0000 Subject: [PATCH] r600g: guard experimental s3tc code with R600_ENABLE_S3TC --- src/gallium/drivers/r600/r600_texture.c | 9 +++++++++ 1 file changed, 9 insertions(+) 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: -- 2.30.2