Mesa (mesa_7_6_branch): mesa: change s3tc vs. fxt1 priority when choosing compressed formats

[Brian Paul]

Module: Mesa
Branch: mesa_7_6_branch
Commit: 5e4f5e41a487e9baa8a63842327d83cee659622e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5e4f5e41a487e9baa8a63842327d83cee659622e

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Oct 23 14:37:14 2009 -0600

mesa: change s3tc vs. fxt1 priority when choosing compressed formats

---

 src/mesa/main/texformat.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index c709004..9d5534e 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -1590,25 +1590,25 @@ _mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat,
       case GL_COMPRESSED_INTENSITY_ARB:
          return &_mesa_texformat_intensity;
       case GL_COMPRESSED_RGB_ARB:
-#if FEATURE_texture_fxt1
-         if (ctx->Extensions.TDFX_texture_compression_FXT1)
-            return &_mesa_texformat_rgb_fxt1;
-#endif
 #if FEATURE_texture_s3tc
          if (ctx->Extensions.EXT_texture_compression_s3tc ||
              ctx->Extensions.S3_s3tc)
             return &_mesa_texformat_rgb_dxt1;
 #endif
-         return &_mesa_texformat_rgb;
-      case GL_COMPRESSED_RGBA_ARB:
 #if FEATURE_texture_fxt1
          if (ctx->Extensions.TDFX_texture_compression_FXT1)
-            return &_mesa_texformat_rgba_fxt1;
+            return &_mesa_texformat_rgb_fxt1;
 #endif
+         return &_mesa_texformat_rgb;
+      case GL_COMPRESSED_RGBA_ARB:
 #if FEATURE_texture_s3tc
          if (ctx->Extensions.EXT_texture_compression_s3tc ||
              ctx->Extensions.S3_s3tc)
-            return &_mesa_texformat_rgba_dxt3; /* Not rgba_dxt1, see spec */
+            return &_mesa_texformat_rgba_dxt5; /* Not rgba_dxt1, see spec */
+#endif
+#if FEATURE_texture_fxt1
+         if (ctx->Extensions.TDFX_texture_compression_FXT1)
+            return &_mesa_texformat_rgba_fxt1;
 #endif
          return &_mesa_texformat_rgba;
       default: