[Mesa-dev] [PATCH 24/30] mesa/main: do not allow EXT_texture_sRGB_R8 enums before gles3

[Gert Wollny]

Thanks for cleaning up my mess,  
Reviewed-By: Gert Wollny <gert.wollny at collabora.com>

Am Montag, den 19.11.2018, 13:15 +0100 schrieb Erik Faye-Lund:
> ctx->Extensions.EXT_texture_sRGB_R8 is set regardless of the API
> that's used, so checking for those direcly will always allow the
> enums from this extensions when they are supported by the driver.
> 
> There's no extension adding support for this on OpenGL ES before
> version 3.0, so let's tighten the check.
> 
> Signed-off-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
> ---
>  src/mesa/main/glformats.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
> index 6c9d8b88d79..d79bcedffd9 100644
> --- a/src/mesa/main/glformats.c
> +++ b/src/mesa/main/glformats.c
> @@ -2473,7 +2473,7 @@ _mesa_base_tex_format(const struct gl_context
> *ctx, GLint internalFormat)
>        }
>     }
>  
> -   if (ctx->Extensions.EXT_texture_sRGB_R8) {
> +   if (_mesa_has_EXT_texture_sRGB_R8(ctx)) {
>        switch (internalFormat) {
>        case GL_SR8_EXT:
>           return GL_RED;
> @@ -3212,7 +3212,7 @@ _mesa_gles_error_check_format_and_type(const
> struct gl_context *ctx,
>        case GL_UNSIGNED_BYTE:
>           if (internalFormat == GL_R8 ||
>               ((internalFormat == GL_SR8_EXT) &&
> -              ctx->Extensions.EXT_texture_sRGB_R8))
> +              _mesa_has_EXT_texture_sRGB_R8(ctx)))
>              break;
>           return GL_INVALID_OPERATION;
>