From: Erik Faye-Lund <erik.faye-lund@collabora.com>
Date: Fri, 16 Nov 2018 10:25:17 +0000 (+0100)
Subject: mesa/main: do not allow sRGB texture enums before gles3
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d97293998605003a89bd772f101254db302672f2;p=mesa.git

mesa/main: do not allow sRGB texture enums before gles3

ctx->Extensions.EXT_texture_sRGB 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@collabora.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---

diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
index 79d7e881b31..b8fe32ca52a 100644
--- a/src/mesa/main/glformats.c
+++ b/src/mesa/main/glformats.c
@@ -2450,7 +2450,7 @@ _mesa_base_tex_format(const struct gl_context *ctx, GLint internalFormat)
       }
    }
 
-   if (ctx->Extensions.EXT_texture_sRGB) {
+   if (_mesa_has_EXT_texture_sRGB(ctx) || _mesa_is_gles3(ctx)) {
       switch (internalFormat) {
       case GL_SRGB_EXT:
       case GL_SRGB8_EXT: