Commit 95739f19 authored by Bryan Cain's avatar Bryan Cain

st/mesa: respect force_s3tc_enable environment variable

NOTE: This is a candidate for the 7.10 and 7.11 branches.
parent b189d163
...@@ -208,6 +208,15 @@ void st_init_limits(struct st_context *st) ...@@ -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 * Use pipe_screen::get_param() to query PIPE_CAP_ values to determine
* which GL extensions are supported. * which GL extensions are supported.
...@@ -426,7 +435,7 @@ void st_init_extensions(struct st_context *st) ...@@ -426,7 +435,7 @@ void st_init_extensions(struct st_context *st)
if (screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA, if (screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA,
PIPE_TEXTURE_2D, 0, PIPE_TEXTURE_2D, 0,
PIPE_BIND_SAMPLER_VIEW) && PIPE_BIND_SAMPLER_VIEW) &&
ctx->Mesa_DXTn) { (ctx->Mesa_DXTn || st_get_s3tc_override())) {
ctx->Extensions.EXT_texture_compression_s3tc = GL_TRUE; ctx->Extensions.EXT_texture_compression_s3tc = GL_TRUE;
ctx->Extensions.S3_s3tc = GL_TRUE; ctx->Extensions.S3_s3tc = GL_TRUE;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment