diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2012-12-01 12:02:04 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2013-01-23 23:38:04 -0500 |
| commit | a021881ccdaf1d81fb7c8bef4b58b4c037dc4f44 (patch) | |
| tree | d4a9d8d0df948ca77926dcb876d01834f43300ac /src/mesa/main/texcompress.c | |
| parent | 8059c2ea9011110df3632e28a4311de9373b9b4e (diff) | |
| download | external_mesa3d-a021881ccdaf1d81fb7c8bef4b58b4c037dc4f44.zip external_mesa3d-a021881ccdaf1d81fb7c8bef4b58b4c037dc4f44.tar.gz external_mesa3d-a021881ccdaf1d81fb7c8bef4b58b4c037dc4f44.tar.bz2 | |
mesa: Use a single flag for the S3TC extensions that don't require on-line compression
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Acked-by: Lee Salzman <lsalzman@gmail.com>
Diffstat (limited to 'src/mesa/main/texcompress.c')
| -rw-r--r-- | src/mesa/main/texcompress.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c index 077a967..734294e 100644 --- a/src/mesa/main/texcompress.c +++ b/src/mesa/main/texcompress.c @@ -37,6 +37,7 @@ #include "formats.h" #include "mfeatures.h" #include "mtypes.h" +#include "context.h" #include "texcompress.h" #include "texcompress_fxt1.h" #include "texcompress_rgtc.h" @@ -264,7 +265,8 @@ _mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats) n += 3; } } - if (ctx->Extensions.S3_s3tc) { + if (_mesa_is_desktop_gl(ctx) + && ctx->Extensions.ANGLE_texture_compression_dxt) { if (formats) { formats[n++] = GL_RGB_S3TC; formats[n++] = GL_RGB4_S3TC; |