Simplify the redundant meaning of format layout.

We really just need to know whether the format is compressed or not.
For more detailed information format colorspace should suffice.

2 files changed, 9 insertions, 8 deletions

diff --git a/src/gallium/auxiliary/util/u_format.h b/src/gallium/auxiliary/util/u_format.h
index 25a06a8f7db..bb7c2add5c6 100644
--- a/src/gallium/auxiliary/util/u_format.h
+++ b/src/gallium/auxiliary/util/u_format.h
@@ -34,11 +34,8 @@
 
 
 enum util_format_layout {
-   UTIL_FORMAT_LAYOUT_SCALAR = 0,
-   UTIL_FORMAT_LAYOUT_ARITH = 1,
-   UTIL_FORMAT_LAYOUT_ARRAY = 2,
-   UTIL_FORMAT_LAYOUT_YUV = 3,
-   UTIL_FORMAT_LAYOUT_DXT = 4
+   UTIL_FORMAT_LAYOUT_PLAIN = 0, /*< RGB, depth-stencil */
+   UTIL_FORMAT_LAYOUT_DXT = 1
 };
 
 
diff --git a/src/gallium/auxiliary/util/u_format_table.py b/src/gallium/auxiliary/util/u_format_table.py
index 87135943766..c772a75e615 100755
--- a/src/gallium/auxiliary/util/u_format_table.py
+++ b/src/gallium/auxiliary/util/u_format_table.py
@@ -35,8 +35,12 @@ import sys
 from u_format_parse import *
 
 
-def layout_map(layout):
-    return 'UTIL_FORMAT_LAYOUT_' + str(layout).upper()
+layout_map = {
+    'arith': 'UTIL_FORMAT_LAYOUT_PLAIN',
+    'array': 'UTIL_FORMAT_LAYOUT_PLAIN',
+    'yuv':   'UTIL_FORMAT_LAYOUT_PLAIN',
+    'dxt':   'UTIL_FORMAT_LAYOUT_DXT',
+}
 
 
 def colorspace_map(colorspace):
@@ -104,7 +108,7 @@ def write_format_table(formats):
         print "      %s," % (format.name,)
         print "      \"%s\"," % (format.name,)
         print "      {%u, %u, %u}, /* block */" % (format.block_width, format.block_height, format.block_size())
-        print "      %s," % (layout_map(format.layout),)
+        print "      %s," % (layout_map[format.layout],)
         print "      {"
         for i in range(4):
             type = format.in_types[i]