aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-07-27 15:27:38 +0200
committermarha <marha@users.sourceforge.net>2011-07-27 15:27:38 +0200
commitfa08275a130f5693e2add977df7cf38d44f2f8da (patch)
tree6d63b2bb601dc39aeab1986ae7106d9e38168666 /mesalib/src/mesa
parent5d81ad3c22666408fa57f6a5373acfaca693d277 (diff)
parent01dc3700436c1fa006d38434e110b68b5d9702ce (diff)
downloadvcxsrv-fa08275a130f5693e2add977df7cf38d44f2f8da.tar.gz
vcxsrv-fa08275a130f5693e2add977df7cf38d44f2f8da.tar.bz2
vcxsrv-fa08275a130f5693e2add977df7cf38d44f2f8da.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/mesa/state_tracker/st_extensions.c
Diffstat (limited to 'mesalib/src/mesa')
-rw-r--r--mesalib/src/mesa/state_tracker/st_extensions.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c
index aa7b104f4..ea97874db 100644
--- a/mesalib/src/mesa/state_tracker/st_extensions.c
+++ b/mesalib/src/mesa/state_tracker/st_extensions.c
@@ -208,6 +208,15 @@ void st_init_limits(struct st_context *st)
}
+static GLboolean st_get_s3tc_override(void)
+{
+ const char *override = _mesa_getenv("force_s3tc_enable");
+ if (override && !strcmp(override, "true"))
+ return GL_TRUE;
+ return GL_FALSE;
+}
+
+
/**
* Use pipe_screen::get_param() to query PIPE_CAP_ values to determine
* which GL extensions are supported.
@@ -426,7 +435,7 @@ void st_init_extensions(struct st_context *st)
if (screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA,
PIPE_TEXTURE_2D, 0,
PIPE_BIND_SAMPLER_VIEW) &&
- ctx->Mesa_DXTn) {
+ (ctx->Mesa_DXTn || st_get_s3tc_override())) {
ctx->Extensions.EXT_texture_compression_s3tc = GL_TRUE;
ctx->Extensions.S3_s3tc = GL_TRUE;
}