[Mesa-dev] [PATCH 1/2] st/mesa: respect force_s3tc_enable environment variable

[Brian Paul]

On 07/20/2011 04:53 PM, Bryan Cain wrote:
> ---
>   src/mesa/state_tracker/st_extensions.c |   12 +++++++++++-
>   1 files changed, 11 insertions(+), 1 deletions(-)
>
> diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
> index 99b231d..073e72c 100644
> --- a/src/mesa/state_tracker/st_extensions.c
> +++ b/src/mesa/state_tracker/st_extensions.c
> @@ -208,6 +208,16 @@ void st_init_limits(struct st_context *st)
>   }
>
>
> +static int st_get_s3tc_override(void)
> +{
> +   const char *override = _mesa_getenv("force_s3tc_enable");
> +   fprintf(stderr, "force_s3tc_enable=%s\n", override);

This fprintf() looks like left-over debug code.

> +   if (override&&  !strcmp(override, "true"))
> +      return GL_TRUE;
> +   return GL_FALSE;

If you're going to return GL_TRUE/GL_FALSE, the function type should 
be GLboolean.


> +}
> +
> +
>   /**
>    * Use pipe_screen::get_param() to query PIPE_CAP_ values to determine
>    * which GL extensions are supported.
> @@ -426,7 +436,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;
>      }