mesa: Branch 'master'

[Haihao Xiang]

 src/mesa/drivers/dri/i965/brw_tex.c |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

New commits:
diff-tree cf4272d2569940fa4ac2ffaf3afbdc2aa3e5cc06 (from bec665d5b5b35c0c9f3263ece9793bcea87073ab)
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Tue Mar 20 22:12:03 2007 +0800

    fix for bug#10347
    
    not sure which brw surface for DXT3 & DXT5, so restore
    the previous choice.(changed in commit
    84081774e62a8af18e6bf894ea69f63b97dcfe96)

diff --git a/src/mesa/drivers/dri/i965/brw_tex.c b/src/mesa/drivers/dri/i965/brw_tex.c
index 467aec6..9d4b986 100644
--- a/src/mesa/drivers/dri/i965/brw_tex.c
+++ b/src/mesa/drivers/dri/i965/brw_tex.c
@@ -154,19 +154,13 @@ brwChooseTextureFormat( GLcontext *ctx, 
 
    case GL_RGB_S3TC:
    case GL_RGB4_S3TC:
-   case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
-       return &_mesa_texformat_rgb_dxt1;
-
-   case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
-       return &_mesa_texformat_rgba_dxt1;
-
    case GL_RGBA_S3TC:
    case GL_RGBA4_S3TC:
    case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
-       return &_mesa_texformat_rgba_dxt3;
-
    case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
-       return &_mesa_texformat_rgba_dxt5;
+   case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+   case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
+     return &_mesa_texformat_rgb_dxt1; /* there is no rgba support? */
 
    case GL_DEPTH_COMPONENT:
    case GL_DEPTH_COMPONENT16: