summaryrefslogtreecommitdiff
path: root/src/gallium/auxiliary/util
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2009-07-27 23:16:32 +0100
committerJosé Fonseca <jfonseca@vmware.com>2009-08-29 09:21:19 +0100
commit899bee27883f771fb2d891fc94483d3d658b5ba3 (patch)
treeec12be4b5dd8cacd1bcee6d8b3f208f2ff2c2a79 /src/gallium/auxiliary/util
parent3ace63c00fe85079599fe088e90ee23e006bada4 (diff)
util: Fix r5g6b5 description.
Diffstat (limited to 'src/gallium/auxiliary/util')
-rw-r--r--src/gallium/auxiliary/util/Makefile3
-rw-r--r--src/gallium/auxiliary/util/u_format.csv4
-rw-r--r--src/gallium/auxiliary/util/u_format_table.c16
3 files changed, 13 insertions, 10 deletions
diff --git a/src/gallium/auxiliary/util/Makefile b/src/gallium/auxiliary/util/Makefile
index 003aa05cb9..bc3571e642 100644
--- a/src/gallium/auxiliary/util/Makefile
+++ b/src/gallium/auxiliary/util/Makefile
@@ -34,3 +34,6 @@ C_SOURCES = \
u_simple_screen.c
include ../../Makefile.template
+
+u_format_table.c: u_format_table.py u_format.csv
+ python u_format_table.py u_format.csv > $@
diff --git a/src/gallium/auxiliary/util/u_format.csv b/src/gallium/auxiliary/util/u_format.csv
index bf8f6ada17..ab56b29a13 100644
--- a/src/gallium/auxiliary/util/u_format.csv
+++ b/src/gallium/auxiliary/util/u_format.csv
@@ -2,8 +2,8 @@ PIPE_FORMAT_A8R8G8B8_UNORM , rgba, 1, 1, un8 , un8 , un8 , un8 , zyxw,
PIPE_FORMAT_X8R8G8B8_UNORM , rgba, 1, 1, un8 , un8 , un8 , un8 , zyx1,
PIPE_FORMAT_B8G8R8A8_UNORM , rgba, 1, 1, un8 , un8 , un8 , un8 , xyzw,
PIPE_FORMAT_B8G8R8X8_UNORM , rgba, 1, 1, un8 , un8 , un8 , un8 , xyz1,
-PIPE_FORMAT_A1R5G5B5_UNORM , rgba, 1, 1, un5 , un5 , un5 , un1 , wxyz,
-PIPE_FORMAT_A4R4G4B4_UNORM , rgba, 1, 1, un4 , un4 , un4 , un4 , wxyz,
+PIPE_FORMAT_A1R5G5B5_UNORM , rgba, 1, 1, un5 , un5 , un5 , un1 , zyxw,
+PIPE_FORMAT_A4R4G4B4_UNORM , rgba, 1, 1, un4 , un4 , un4 , un4 , zyxw,
PIPE_FORMAT_R5G6B5_UNORM , rgba, 1, 1, un5 , un6 , un5 , , zyx1,
PIPE_FORMAT_A2B10G10R10_UNORM , rgba, 1, 1, un10, un10, un10, un2 , wzyx,
PIPE_FORMAT_L8_UNORM , rgba, 1, 1, un8 , , , , xxx1,
diff --git a/src/gallium/auxiliary/util/u_format_table.c b/src/gallium/auxiliary/util/u_format_table.c
index 84e91b44ee..ea19d2fb79 100644
--- a/src/gallium/auxiliary/util/u_format_table.c
+++ b/src/gallium/auxiliary/util/u_format_table.c
@@ -120,10 +120,10 @@ util_format_description_table[] =
{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 1} /* w */
},
{
- UTIL_FORMAT_SWIZZLE_W, /* r */
- UTIL_FORMAT_SWIZZLE_X, /* g */
- UTIL_FORMAT_SWIZZLE_Y, /* b */
- UTIL_FORMAT_SWIZZLE_Z /* a */
+ UTIL_FORMAT_SWIZZLE_Z, /* r */
+ UTIL_FORMAT_SWIZZLE_Y, /* g */
+ UTIL_FORMAT_SWIZZLE_X, /* b */
+ UTIL_FORMAT_SWIZZLE_W /* a */
},
UTIL_FORMAT_COLORSPACE_RGB,
},
@@ -139,10 +139,10 @@ util_format_description_table[] =
{UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 4} /* w */
},
{
- UTIL_FORMAT_SWIZZLE_W, /* r */
- UTIL_FORMAT_SWIZZLE_X, /* g */
- UTIL_FORMAT_SWIZZLE_Y, /* b */
- UTIL_FORMAT_SWIZZLE_Z /* a */
+ UTIL_FORMAT_SWIZZLE_Z, /* r */
+ UTIL_FORMAT_SWIZZLE_Y, /* g */
+ UTIL_FORMAT_SWIZZLE_X, /* b */
+ UTIL_FORMAT_SWIZZLE_W /* a */
},
UTIL_FORMAT_COLORSPACE_RGB,
},