Module: Mesa Branch: master Commit: 0cf04183633ad4f8140cdb1219235761c402a594 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0cf04183633ad4f8140cdb1219235761c402a594
Author: Marek Olšák <[email protected]> Date: Sun Jan 22 18:47:21 2012 +0100 st/mesa: require all s3tc formats for EXT_texture_compression_s3tc Reviewed-by: Brian Paul <[email protected]> --- src/mesa/state_tracker/st_extensions.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 527e56d..809d6c1 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -436,7 +436,16 @@ void st_init_extensions(struct st_context *st) } /* s3tc support */ - if (screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA, + if (screen->is_format_supported(screen, PIPE_FORMAT_DXT1_RGB, + PIPE_TEXTURE_2D, 0, + PIPE_BIND_SAMPLER_VIEW) && + screen->is_format_supported(screen, PIPE_FORMAT_DXT1_RGBA, + PIPE_TEXTURE_2D, 0, + PIPE_BIND_SAMPLER_VIEW) && + screen->is_format_supported(screen, PIPE_FORMAT_DXT3_RGBA, + PIPE_TEXTURE_2D, 0, + PIPE_BIND_SAMPLER_VIEW) && + screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA, PIPE_TEXTURE_2D, 0, PIPE_BIND_SAMPLER_VIEW) && (ctx->Mesa_DXTn || st_get_s3tc_override())) { _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
