Mesa (master): st/mesa: consolidate listing of depth formats

[Marek Olšák]

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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sat May 28 15:50:10 2011 +0200

st/mesa: consolidate listing of depth formats

Reviewed-by: Brian Paul <brianp at vmware.com>

---

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

diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index 4360ed7..c22a1d5 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -595,6 +595,14 @@ struct format_mapping
       PIPE_FORMAT_A8B8G8R8_SRGB, \
       0
 
+#define DEFAULT_DEPTH_FORMATS \
+      PIPE_FORMAT_Z24X8_UNORM, \
+      PIPE_FORMAT_X8Z24_UNORM, \
+      PIPE_FORMAT_Z16_UNORM, \
+      PIPE_FORMAT_Z24_UNORM_S8_USCALED, \
+      PIPE_FORMAT_S8_USCALED_Z24_UNORM, \
+      0
+
 /**
  * This table maps OpenGL texture format enums to Gallium pipe_format enums.
  * Multiple GL enums might map to multiple pipe_formats.
@@ -736,27 +744,20 @@ static struct format_mapping format_map[] = {
    /* Depth formats */
    {
       { GL_DEPTH_COMPONENT16, 0 },
-      { PIPE_FORMAT_Z16_UNORM, PIPE_FORMAT_Z24_UNORM_S8_USCALED,
-        PIPE_FORMAT_S8_USCALED_Z24_UNORM, PIPE_FORMAT_Z32_UNORM, 0 }
+      { PIPE_FORMAT_Z16_UNORM, DEFAULT_DEPTH_FORMATS }
    },
    {
       { GL_DEPTH_COMPONENT24, 0 },
       { PIPE_FORMAT_Z24X8_UNORM, PIPE_FORMAT_X8Z24_UNORM,
-        PIPE_FORMAT_Z24_UNORM_S8_USCALED, PIPE_FORMAT_S8_USCALED_Z24_UNORM,
-        PIPE_FORMAT_Z32_UNORM, 0 }
+        DEFAULT_DEPTH_FORMATS }
    },
    {
       { GL_DEPTH_COMPONENT32, 0 },
-      { PIPE_FORMAT_Z32_UNORM,
-        PIPE_FORMAT_Z24X8_UNORM, PIPE_FORMAT_X8Z24_UNORM,
-        PIPE_FORMAT_Z16_UNORM,
-        PIPE_FORMAT_Z24_UNORM_S8_USCALED, PIPE_FORMAT_S8_USCALED_Z24_UNORM, 0 }
+      { PIPE_FORMAT_Z32_UNORM, DEFAULT_DEPTH_FORMATS }
    },
    {
       { GL_DEPTH_COMPONENT, 0 },
-      { PIPE_FORMAT_Z24X8_UNORM, PIPE_FORMAT_X8Z24_UNORM,
-        PIPE_FORMAT_Z32_UNORM, PIPE_FORMAT_Z16_UNORM,
-        PIPE_FORMAT_Z24_UNORM_S8_USCALED, PIPE_FORMAT_S8_USCALED_Z24_UNORM, 0 }
+      { DEFAULT_DEPTH_FORMATS }
    },
 
    /* stencil formats */