Mesa (master): st/mesa: get rid of default_deep_rgba_format()

Brian Paul brianp at kemper.freedesktop.org
Fri Apr 23 18:32:30 UTC 2010


Module: Mesa
Branch: master
Commit: a8c78f3aa13ee6a370f79c8d5936c75ba29ec193
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a8c78f3aa13ee6a370f79c8d5936c75ba29ec193

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Apr 23 12:15:06 2010 -0600

st/mesa: get rid of default_deep_rgba_format()

This special-case code used to be used for the accum buffer but
the accum buffer implementation was changed some time ago.

---

 src/mesa/state_tracker/st_format.c |   24 +-----------------------
 1 files changed, 1 insertions(+), 23 deletions(-)

diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index 3e76750..180118d 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -387,25 +387,6 @@ default_srgba_format(struct pipe_screen *screen,
 
 
 /**
- * Search list of formats for first RGBA format with >8 bits/channel.
- */
-static enum pipe_format
-default_deep_rgba_format(struct pipe_screen *screen, 
-                         enum pipe_texture_target target,
-                         unsigned tex_usage, 
-                         unsigned geom_flags)
-{
-   if (screen->is_format_supported(screen, PIPE_FORMAT_R16G16B16A16_SNORM, target, tex_usage, geom_flags)) {
-      return PIPE_FORMAT_R16G16B16A16_SNORM;
-   }
-   if (tex_usage & PIPE_BIND_RENDER_TARGET)
-      return default_rgba_format(screen, target, tex_usage, geom_flags);
-   else
-      return PIPE_FORMAT_NONE;
-}
-
-
-/**
  * Given an OpenGL internalFormat value for a texture or surface, return
  * the best matching PIPE_FORMAT_x, or PIPE_FORMAT_NONE if there's no match.
  * \param target  one of PIPE_TEXTURE_x
@@ -431,10 +412,7 @@ st_choose_format(struct pipe_screen *screen, GLenum internalFormat,
    case GL_COMPRESSED_RGB:
       return default_rgb_format( screen, target, tex_usage, geom_flags );
    case GL_RGBA16:
-      if (tex_usage & PIPE_BIND_RENDER_TARGET)
-         return default_deep_rgba_format( screen, target, tex_usage, geom_flags );
-      else
-         return default_rgba_format( screen, target, tex_usage, geom_flags );
+      return default_rgba_format( screen, target, tex_usage, geom_flags );
 
    case GL_RGBA4:
    case GL_RGBA2:




More information about the mesa-commit mailing list