diff options
| author | Maciej Cencora <m.cencora@gmail.com> | 2009-11-18 22:09:33 +0100 |
|---|---|---|
| committer | Maciej Cencora <m.cencora@gmail.com> | 2009-11-18 22:09:33 +0100 |
| commit | cefee4e327c92daa2f01b6de650a43eddd348063 (patch) | |
| tree | d1d25c4883357b12fd0c1deecc49cddc7e46976d /src/mesa/drivers/dri/r300/r300_context.c | |
| parent | d4dc2e30dada1be425e95ba270920db6eb210982 (diff) | |
| parent | 7118db870091d4c9c2465e79f361ff0ed36d1f90 (diff) | |
Merge branch 'radeon-texrewrite-clean' into mesa_7_7_branch
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_context.c')
| -rw-r--r-- | 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 6f66e970e4..3ed49a85c5 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) { |