Mesa (mesa_7_7_branch): st/mesa: remove is_compressed_mesa_format()
Brian Paul
brianp at kemper.freedesktop.org
Thu Nov 19 21:35:59 UTC 2009
Module: Mesa
Branch: mesa_7_7_branch
Commit: 92863109af05acdb4ee5e42141c83ab0f18b7f88
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=92863109af05acdb4ee5e42141c83ab0f18b7f88
Author: Brian Paul <brianp at vmware.com>
Date: Thu Nov 19 14:17:09 2009 -0700
st/mesa: remove is_compressed_mesa_format()
---
src/mesa/state_tracker/st_cb_texture.c | 23 ++---------------------
1 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 5283ece..76b6bbe 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -119,25 +119,6 @@ compressed_num_bytes(gl_format format)
}
-static GLboolean
-is_compressed_mesa_format(gl_format format)
-{
- switch (format) {
- case MESA_FORMAT_RGB_DXT1:
- case MESA_FORMAT_RGBA_DXT1:
- case MESA_FORMAT_RGBA_DXT3:
- case MESA_FORMAT_RGBA_DXT5:
- case MESA_FORMAT_SRGB_DXT1:
- case MESA_FORMAT_SRGBA_DXT1:
- case MESA_FORMAT_SRGBA_DXT3:
- case MESA_FORMAT_SRGBA_DXT5:
- return GL_TRUE;
- default:
- return GL_FALSE;
- }
-}
-
-
/** called via ctx->Driver.NewTextureImage() */
static struct gl_texture_image *
st_NewTextureImage(GLcontext * ctx)
@@ -663,7 +644,7 @@ st_TexImage(GLcontext * ctx,
*/
if (!compressed_src &&
!ctx->Mesa_DXTn &&
- is_compressed_mesa_format(texImage->TexFormat) &&
+ _mesa_is_format_compressed(texImage->TexFormat) &&
screen->is_format_supported(screen,
stImage->pt->format,
stImage->pt->target,
@@ -1066,7 +1047,7 @@ st_TexSubimage(GLcontext *ctx, GLint dims, GLenum target, GLint level,
/* See if we can do texture compression with a blit/render.
*/
if (!ctx->Mesa_DXTn &&
- is_compressed_mesa_format(texImage->TexFormat) &&
+ _mesa_is_format_compressed(texImage->TexFormat) &&
screen->is_format_supported(screen,
stImage->pt->format,
stImage->pt->target,
More information about the mesa-commit
mailing list