fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-27 22:50:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

mesa/main: do not allow astc enums on gles1

Browse source 
ctx->Extensions.KHR_texture_compression_astc_ldr 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 ASTC for OpenGL ES 1.x, so we
shouldn't allow those enums there.

Signed-off-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Erik Faye-Lund 2018-11-16 09:51:26 +01:00
parent 1aa134038c
commit 2dfcaf7554
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/main/glformats.c
View file

@ -1389,7 +1389,7 @@ _mesa_is_compressed_format(const struct gl_context *ctx, GLenum format)
case MESA_FORMAT_LAYOUT_BPTC:
return _mesa_has_ARB_texture_compression_bptc(ctx);
case MESA_FORMAT_LAYOUT_ASTC:
return ctx->Extensions.KHR_texture_compression_astc_ldr;
return _mesa_has_KHR_texture_compression_astc_ldr(ctx);
default:
return GL_FALSE;
}
@ -2373,9 +2373,9 @@ _mesa_base_tex_format(const struct gl_context *ctx, GLint internalFormat)
return base_compressed;
}
if ((ctx->Extensions.KHR_texture_compression_astc_ldr &&
if ((_mesa_has_KHR_texture_compression_astc_ldr(ctx) &&
is_astc_2d_format(internalFormat)) ||
(ctx->Extensions.OES_texture_compression_astc &&
(_mesa_has_OES_texture_compression_astc(ctx) &&
is_astc_3d_format(internalFormat)))
return GL_RGBA;