From c4136ed5cc07a73c01d24a1c17ebe71e2690aef7 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Fri, 16 Nov 2018 11:30:34 +0100 Subject: [PATCH] mesa/main: do not allow EXT_texture_sRGB_R8 enums before gles3 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-By: Gert Wollny Reviewed-by: Marek Olšák --- 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 b8fe32ca52a..4753465e50c 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; -- 2.30.2