diff options
| author | Nian Wu <nian.wu@intel.com> | 2007-03-21 17:00:32 +0800 |
|---|---|---|
| committer | Nian Wu <nian.wu@intel.com> | 2007-03-21 17:00:32 +0800 |
| commit | 8ba06464ac8de726390899e790e15b40df08001e (patch) | |
| tree | 8427cef9e66f329166b7cf366e09fa99e060f896 /src/mesa/drivers/dri/i965 | |
| parent | 76444d042c841aa4e060db46c0668c17da97a1f6 (diff) | |
| parent | 4b5d6c0435acd84c13e0db3785758fed0bc48fe1 (diff) | |
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
Diffstat (limited to 'src/mesa/drivers/dri/i965')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_tex.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_tex.c b/src/mesa/drivers/dri/i965/brw_tex.c index 467aec64a0..9d4b9867d2 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, GLint internalFormat, 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: |