From: Maciej Cencora <m.cencora@gmail.com>
Date: Wed, 18 Nov 2009 21:19:25 +0000 (+0100)
Subject: r300: allow disabling s3tc support if libtxc_dxtn is available
X-Git-Tag: 062012170305~15631^2~155
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3bf12c8bea667f5fff0b6f495820a27141f595a2;p=profile%2Fivi%2Fmesa.git

r300: allow disabling s3tc support if libtxc_dxtn is available
---

diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c
index 3ed49a8..5f07b95 100644
--- a/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@ -439,11 +439,11 @@ static void r300InitGLExtensions(GLcontext *ctx)
 	if (r300->options.stencil_two_side_disabled)
 		_mesa_disable_extension(ctx, "GL_EXT_stencil_two_side");
 
-	if (ctx->Mesa_DXTn || r300->options.s3tc_force_enabled) {
+	if (r300->options.s3tc_force_disabled) {
+		_mesa_disable_extension(ctx, "GL_EXT_texture_compression_s3tc");
+	} else if (ctx->Mesa_DXTn || r300->options.s3tc_force_enabled) {
 		_mesa_enable_extension(ctx, "GL_EXT_texture_compression_s3tc");
 		_mesa_enable_extension(ctx, "GL_S3_s3tc");
-	} else if (r300->options.s3tc_force_disabled) {
-		_mesa_disable_extension(ctx, "GL_EXT_texture_compression_s3tc");
 	}
 
 	if (!r300->radeon.radeonScreen->drmSupportsOcclusionQueries) {