Mesa (master): r300: fix condition logic

Maciej Cencora osiris at kemper.freedesktop.org
Mon Aug 24 23:32:20 UTC 2009


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

Author: Maciej Cencora <m.cencora at gmail.com>
Date:   Tue Aug 25 01:27:40 2009 +0200

r300: fix condition logic

The s3tc extensions are properly enabled now, when force_s3tc_enable option is set in driconf.

---

 src/mesa/drivers/dri/r300/r300_context.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c
index d457ac1..f701c43 100644
--- a/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@ -433,7 +433,7 @@ 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_enabled) {
 		_mesa_enable_extension(ctx, "GL_EXT_texture_compression_s3tc");
 		_mesa_enable_extension(ctx, "GL_S3_s3tc");
 	} else if (r300->options.s3tc_force_disabled) {




More information about the mesa-commit mailing list