[Mesa-dev] [PATCH 2/2] st/mesa: remove unused st_equal_formats() function

Brian Paul brianp at vmware.com
Tue Feb 14 07:54:16 PST 2012


It was incomplete and didn't take byte swapping into account either.
---
 src/mesa/state_tracker/st_format.c |   18 ------------------
 src/mesa/state_tracker/st_format.h |    3 ---
 2 files changed, 0 insertions(+), 21 deletions(-)

diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index 2fdbcd7..4265d14 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -1639,24 +1639,6 @@ st_ChooseTextureFormat(struct gl_context *ctx, GLint internalFormat,
 					    format, type, want_renderable);
 }
 
-/**
- * Test if a gallium format is equivalent to a GL format/type.
- */
-GLboolean
-st_equal_formats(enum pipe_format pFormat, GLenum format, GLenum type)
-{
-   switch (pFormat) {
-   case PIPE_FORMAT_A8B8G8R8_UNORM:
-      return format == GL_RGBA && type == GL_UNSIGNED_BYTE;
-   case PIPE_FORMAT_A8R8G8B8_UNORM:
-      return format == GL_BGRA && type == GL_UNSIGNED_BYTE;
-   case PIPE_FORMAT_B5G6R5_UNORM:
-      return format == GL_RGB && type == GL_UNSIGNED_SHORT_5_6_5;
-   /* XXX more combos... */
-   default:
-      return GL_FALSE;
-   }
-}
 
 GLboolean
 st_sampler_compat_formats(enum pipe_format format1, enum pipe_format format2)
diff --git a/src/mesa/state_tracker/st_format.h b/src/mesa/state_tracker/st_format.h
index 1dea0d9..7cf92eb 100644
--- a/src/mesa/state_tracker/st_format.h
+++ b/src/mesa/state_tracker/st_format.h
@@ -67,9 +67,6 @@ st_ChooseTextureFormat(struct gl_context * ctx, GLint internalFormat,
                        GLenum format, GLenum type);
 
 
-extern GLboolean
-st_equal_formats(enum pipe_format pFormat, GLenum format, GLenum type);
-
 /* can we use a sampler view to translate these formats
    only used to make TFP so far */
 extern GLboolean
-- 
1.7.3.4



More information about the mesa-dev mailing list