projects
/
profile
/
ivi
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aa19561
)
r300: fix regression introduced in 1d5a06a1f7812c055db1d724e40d21a0e3686dd1
author
Maciej Cencora
<m.cencora@gmail.com>
Wed, 11 Nov 2009 17:55:49 +0000
(18:55 +0100)
committer
Maciej Cencora
<m.cencora@gmail.com>
Sat, 14 Nov 2009 13:43:34 +0000
(14:43 +0100)
Spotted by Dave Airlie
src/mesa/drivers/dri/r300/r300_context.c
patch
|
blob
|
history
diff --git
a/src/mesa/drivers/dri/r300/r300_context.c
b/src/mesa/drivers/dri/r300/r300_context.c
index
6f66e97
..
3ed49a8
100644
(file)
--- 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) {