From 456a02b0c7722f22962bca4c26b755381a8de096 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 14 Feb 2012 08:47:28 -0700 Subject: [PATCH] st/mesa: remove unused st_equal_formats() function It was incomplete and didn't take byte swapping into account either. Reviewed-by: Jose Fonseca --- src/mesa/state_tracker/st_format.c | 18 ------------------ src/mesa/state_tracker/st_format.h | 3 --- 2 files changed, 21 deletions(-) diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c index 2fdbcd773ea..4265d14b4e3 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 1dea0d9a5e7..7cf92eb41e6 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 -- 2.30.2