fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-28 03:10:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

mesa/main: clean up S3_s3tc check

Browse source 
S3_s3tc is the extension that enables this functionality on desktop, so
let's check for that one. The _mesa_has_S3_s3tc() helper already
verifies the API according to the extension-table.

As for the second hunk, we currently already only expose
EXT_texture_compression_s3tc on desktop so by using the helper instead,
we get rid of this detail here, and once we enable it for GLES we'll
automaticall get the interaction right.

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-15 16:01:49 +01:00
parent e8b331ae13
commit 1373d117c2
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1352,8 +1352,7 @@ _mesa_is_compressed_format(const struct gl_context *ctx, GLenum format)
case GL_RGB4_S3TC:
case GL_RGBA_S3TC:
case GL_RGBA4_S3TC:
return _mesa_is_desktop_gl(ctx) &&
ctx->Extensions.ANGLE_texture_compression_dxt;
return _mesa_has_S3_s3tc(ctx);
case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:
return ctx->API == API_OPENGL_COMPAT
&& ctx->Extensions.ATI_texture_compression_3dc;
@ -1378,9 +1377,8 @@ _mesa_is_compressed_format(const struct gl_context *ctx, GLenum format)
*/
return ctx->Extensions.ANGLE_texture_compression_dxt;
} else {
return _mesa_is_desktop_gl(ctx)
&& ctx->Extensions.EXT_texture_sRGB
&& ctx->Extensions.EXT_texture_compression_s3tc;
return _mesa_has_EXT_texture_sRGB(ctx) &&
_mesa_has_EXT_texture_compression_s3tc(ctx);
}
case MESA_FORMAT_LAYOUT_FXT1:
return _mesa_is_desktop_gl(ctx)