Mesa (mesa_7_7_branch): r300: fix regression introduced in 1d5a06a1f7812c055db1d724e40d21a0e3686dd1
Maciej Cencora
osiris at kemper.freedesktop.org
Wed Nov 18 21:23:02 UTC 2009
Module: Mesa
Branch: mesa_7_7_branch
Commit: 6e5d473cc16ca2d001df213fc1d907f2943a95bb
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6e5d473cc16ca2d001df213fc1d907f2943a95bb
Author: Maciej Cencora <m.cencora at gmail.com>
Date: Wed Nov 11 18:55:49 2009 +0100
r300: fix regression introduced in 1d5a06a1f7812c055db1d724e40d21a0e3686dd1
Spotted by Dave Airlie
---
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 6f66e97..3ed49a8 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) {
More information about the mesa-commit
mailing list