summaryrefslogtreecommitdiff
path: root/src/gallium/auxiliary
diff options
context:
space:
mode:
Diffstat (limited to 'src/gallium/auxiliary')
-rw-r--r--src/gallium/auxiliary/util/u_format.h7
-rwxr-xr-xsrc/gallium/auxiliary/util/u_format_table.py10
2 files changed, 8 insertions, 9 deletions
diff --git a/src/gallium/auxiliary/util/u_format.h b/src/gallium/auxiliary/util/u_format.h
index bb7c2add5c..25a06a8f7d 100644
--- a/src/gallium/auxiliary/util/u_format.h
+++ b/src/gallium/auxiliary/util/u_format.h
@@ -34,8 +34,11 @@
enum util_format_layout {
- UTIL_FORMAT_LAYOUT_PLAIN = 0, /*< RGB, depth-stencil */
- UTIL_FORMAT_LAYOUT_DXT = 1
+ 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
};
diff --git a/src/gallium/auxiliary/util/u_format_table.py b/src/gallium/auxiliary/util/u_format_table.py
index c772a75e61..8713594376 100755
--- a/src/gallium/auxiliary/util/u_format_table.py
+++ b/src/gallium/auxiliary/util/u_format_table.py
@@ -35,12 +35,8 @@ import sys
from u_format_parse import *
-layout_map = {
- 'arith': 'UTIL_FORMAT_LAYOUT_PLAIN',
- 'array': 'UTIL_FORMAT_LAYOUT_PLAIN',
- 'yuv': 'UTIL_FORMAT_LAYOUT_PLAIN',
- 'dxt': 'UTIL_FORMAT_LAYOUT_DXT',
-}
+def layout_map(layout):
+ return 'UTIL_FORMAT_LAYOUT_' + str(layout).upper()
def colorspace_map(colorspace):
@@ -108,7 +104,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]