Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/mesa/state_tracker/st_extensions.c

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;

    }