diff options
| author | Corbin Simpson <MostAwesomeDude@gmail.com> | 2010-03-29 20:57:06 -0700 |
|---|---|---|
| committer | Corbin Simpson <MostAwesomeDude@gmail.com> | 2010-03-31 18:55:23 -0700 |
| commit | e83728f7ee6db6e91bdfb0c91f046f56d89cffc0 (patch) | |
| tree | ff17c84f16c4977e31d8be78f087441e9851c99a | |
| parent | a3d6162200013dddbeab1d73d04a4d668f407fb3 (diff) | |
mesa/st: Relax S3TC extension enable rules.
Per the last commit, the cases that need to be satisfied are greatly
reduced:
~ Upload: Tested; we need to be able to sample from it to use it.
~ Decompression: Works; see st_cb_texture.c:decompress_from_blit().
~ Compression: Optional by spec, and will work if libdxtn is around.
I think we may need to check for all four formats here, but I don't know
of any hardware that doesn't support only one of four.
| -rw-r--r-- | src/mesa/state_tracker/st_extensions.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 290ee36b0f..377fb6e16c 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -311,11 +311,7 @@ void st_init_extensions(struct st_context *st) /* s3tc support */ if (screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA, PIPE_TEXTURE_2D, - PIPE_TEXTURE_USAGE_SAMPLER, 0) && - (ctx->Mesa_DXTn || - screen->is_format_supported(screen, PIPE_FORMAT_DXT5_RGBA, - PIPE_TEXTURE_2D, - PIPE_TEXTURE_USAGE_RENDER_TARGET, 0))) { + PIPE_TEXTURE_USAGE_SAMPLER, 0)) { ctx->Extensions.EXT_texture_compression_s3tc = GL_TRUE; ctx->Extensions.S3_s3tc = GL_TRUE; } |