mesa/main: do not allow snorm-texture enums before gles3
authorErik Faye-Lund <erik.faye-lund@collabora.com>
Fri, 16 Nov 2018 10:10:23 +0000 (11:10 +0100)
committerErik Faye-Lund <erik.faye-lund@collabora.com>
Mon, 3 Dec 2018 17:16:44 +0000 (18:16 +0100)
ctx->Extensions.EXT_texture_snorm 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>
src/mesa/main/glformats.c

index 174f17d882d658320f9659556b28b26c8336afa7..79d7e881b317b22c9986e0cf29b1dfb1b5f6bb26 100644 (file)
@@ -2411,7 +2411,7 @@ _mesa_base_tex_format(const struct gl_context *ctx, GLint internalFormat)
       }
    }
 
-   if (ctx->Extensions.EXT_texture_snorm) {
+   if (_mesa_has_EXT_texture_snorm(ctx) || _mesa_is_gles3(ctx)) {
       switch (internalFormat) {
       case GL_RED_SNORM:
       case GL_R8_SNORM: