diff options
Diffstat (limited to 'src/mesa/main/texformat.c')
| -rw-r--r-- | src/mesa/main/texformat.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c index 038dc0bb50..39c561e278 100644 --- a/src/mesa/main/texformat.c +++ b/src/mesa/main/texformat.c @@ -164,26 +164,18 @@ _mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat, case GL_COMPRESSED_INTENSITY_ARB: return MESA_FORMAT_I8; case GL_COMPRESSED_RGB_ARB: -#if FEATURE_texture_fxt1 - if (ctx->Extensions.TDFX_texture_compression_FXT1) - return MESA_FORMAT_RGB_FXT1; -#endif -#if FEATURE_texture_s3tc if (ctx->Extensions.EXT_texture_compression_s3tc || ctx->Extensions.S3_s3tc) return MESA_FORMAT_RGB_DXT1; -#endif + if (ctx->Extensions.TDFX_texture_compression_FXT1) + return MESA_FORMAT_RGB_FXT1; return MESA_FORMAT_RGB888; case GL_COMPRESSED_RGBA_ARB: -#if FEATURE_texture_fxt1 - if (ctx->Extensions.TDFX_texture_compression_FXT1) - return MESA_FORMAT_RGBA_FXT1; -#endif -#if FEATURE_texture_s3tc if (ctx->Extensions.EXT_texture_compression_s3tc || ctx->Extensions.S3_s3tc) return MESA_FORMAT_RGBA_DXT3; /* Not rgba_dxt1, see spec */ -#endif + if (ctx->Extensions.TDFX_texture_compression_FXT1) + return MESA_FORMAT_RGBA_FXT1; return MESA_FORMAT_RGBA8888; default: ; /* fallthrough */ |