From: Erik Faye-Lund Date: Thu, 15 Nov 2018 15:33:49 +0000 (+0100) Subject: mesa/main: do not allow etc2 enums on gles1 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1aa134038c3b9eefd6d7e6d227bea7bdc5bb7a4e;p=mesa.git mesa/main: do not allow etc2 enums on gles1 ctx->Extensions.ARB_ES3_compatibility is set regardless of the API that's used, so checking for those direcly will always enable extensions when they are supported by the driver. But there's no extension enabling ETC2 for OpenGL ES 1.x, so we shouldn't allow those enums there. Signed-off-by: Erik Faye-Lund Reviewed-by: Marek Olšák --- diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c index 0d782ce8bc7..b0711d3b9ec 100644 --- a/src/mesa/main/glformats.c +++ b/src/mesa/main/glformats.c @@ -1385,7 +1385,7 @@ _mesa_is_compressed_format(const struct gl_context *ctx, GLenum format) case MESA_FORMAT_LAYOUT_ETC1: return _mesa_has_OES_compressed_ETC1_RGB8_texture(ctx); case MESA_FORMAT_LAYOUT_ETC2: - return _mesa_is_gles3(ctx) || ctx->Extensions.ARB_ES3_compatibility; + return _mesa_is_gles3(ctx) || _mesa_has_ARB_ES3_compatibility(ctx); case MESA_FORMAT_LAYOUT_BPTC: return _mesa_has_ARB_texture_compression_bptc(ctx); case MESA_FORMAT_LAYOUT_ASTC: