From: Maciej Cencora <m.cencora@gmail.com>
Date: Wed, 11 Nov 2009 17:55:49 +0000 (+0100)
Subject: r300: fix regression introduced in 1d5a06a1f7812c055db1d724e40d21a0e3686dd1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6e5d473cc16ca2d001df213fc1d907f2943a95bb;p=mesa.git

r300: fix regression introduced in 1d5a06a1f7812c055db1d724e40d21a0e3686dd1

Spotted by Dave Airlie
---

diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c
index 6f66e970e48..3ed49a85c5b 100644
--- a/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@ -439,7 +439,7 @@ static void r300InitGLExtensions(GLcontext *ctx)
 	if (r300->options.stencil_two_side_disabled)
 		_mesa_disable_extension(ctx, "GL_EXT_stencil_two_side");
 
-	if (r300->options.s3tc_force_enabled) {
+	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) {