summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2012-01-22 18:47:21 +0100
committerMarek Olšák <[email protected]>2012-01-25 12:35:19 +0100
commit0cf04183633ad4f8140cdb1219235761c402a594 (patch)
tree16623fd7d2be6edb938f7619b05c2db633a14aaf /src/mesa
parent925fd2e1ddf9fbeb1d21a9b1223fe6fc13192dc7 (diff)
st/mesa: require all s3tc formats for EXT_texture_compression_s3tc
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/state_tracker/st_extensions.c11
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 527e56d18bd..809d6c170c1 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())) {