nv50,nvc0: extensive surface format renaming to get consistency

Now the component ordering is consistent and matches gallium again.

1 files changed, 67 insertions, 55 deletions

diff --git a/src/gallium/drivers/nv50/nv50_defs.xml.h b/src/gallium/drivers/nv50/nv50_defs.xml.h
index 1bf2f802b56..27046e9e564 100644
--- a/src/gallium/drivers/nv50/nv50_defs.xml.h
+++ b/src/gallium/drivers/nv50/nv50_defs.xml.h
@@ -1,5 +1,5 @@
-#ifndef NV50_DEFS_XML
-#define NV50_DEFS_XML
+#ifndef RNNDB_NV50_DEFS_XML
+#define RNNDB_NV50_DEFS_XML
 
 /* Autogenerated file, DO NOT EDIT manually!
 
@@ -8,10 +8,11 @@ http://0x04.net/cgit/index.cgi/rules-ng-ng
 git clone git://0x04.net/rules-ng-ng
 
 The rules-ng-ng source files this header was generated from are:
-- nv50_defs.xml (   4482 bytes, from 2010-10-03 13:18:37)
-- copyright.xml (   6498 bytes, from 2010-10-03 13:18:37)
+- rnndb/nv50_defs.xml    (   5468 bytes, from 2011-07-09 13:43:58)
+- ./rnndb/copyright.xml  (   6452 bytes, from 2011-07-09 13:43:58)
+- ./rnndb/nvchipsets.xml (   3617 bytes, from 2011-07-09 13:43:58)
 
-Copyright (C) 2006-2010 by the following authors:
+Copyright (C) 2006-2011 by the following authors:
 - Artur Huillet <[email protected]> (ahuillet)
 - Ben Skeggs (darktama, darktama_)
 - B. R. <[email protected]> (koala_br)
@@ -22,7 +23,7 @@ Copyright (C) 2006-2010 by the following authors:
 - Dmitry Eremin-Solenikov <[email protected]> (lumag)
 - EdB <[email protected]> (edb_)
 - Erik Waling <[email protected]> (erikwaling)
-- Francisco Jerez <[email protected]> (curro, curro_, currojerez)
+- Francisco Jerez <[email protected]> (curro)
 - imirkin <[email protected]> (imirkin)
 - jb17bsome <[email protected]> (jb17bsome)
 - Jeremy Kolb <[email protected]> (kjeremy)
@@ -70,44 +71,50 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 
-#define NV50_SURFACE_FORMAT_R32G32B32A32_FLOAT			0x000000c0
-#define NV50_SURFACE_FORMAT_R32G32B32A32_SINT			0x000000c1
-#define NV50_SURFACE_FORMAT_R32G32B32A32_UINT			0x000000c2
-#define NV50_SURFACE_FORMAT_R32G32B32X32_FLOAT			0x000000c3
-#define NV50_SURFACE_FORMAT_R16G16B16A16_UNORM			0x000000c6
-#define NV50_SURFACE_FORMAT_R16G16B16A16_SNORM			0x000000c7
-#define NV50_SURFACE_FORMAT_R16G16B16A16_SINT			0x000000c8
-#define NV50_SURFACE_FORMAT_R16G16B16A16_UINT			0x000000c9
-#define NV50_SURFACE_FORMAT_R16G16B16A16_FLOAT			0x000000ca
-#define NV50_SURFACE_FORMAT_R32G32_FLOAT			0x000000cb
-#define NV50_SURFACE_FORMAT_R32G32_SINT				0x000000cc
-#define NV50_SURFACE_FORMAT_R32G32_UINT				0x000000cd
-#define NV50_SURFACE_FORMAT_R16G16B16X16_FLOAT			0x000000ce
-#define NV50_SURFACE_FORMAT_A8R8G8B8_UNORM			0x000000cf
-#define NV50_SURFACE_FORMAT_A8R8G8B8_SRGB			0x000000d0
-#define NV50_SURFACE_FORMAT_A2B10G10R10_UNORM			0x000000d1
-#define NV50_SURFACE_FORMAT_A2B10G10R10_UINT			0x000000d2
-#define NV50_SURFACE_FORMAT_A8B8G8R8_UNORM			0x000000d5
-#define NV50_SURFACE_FORMAT_A8B8G8R8_SRGB			0x000000d6
-#define NV50_SURFACE_FORMAT_A8B8G8R8_SNORM			0x000000d7
-#define NV50_SURFACE_FORMAT_A8B8G8R8_SINT			0x000000d8
-#define NV50_SURFACE_FORMAT_A8B8G8R8_UINT			0x000000d9
-#define NV50_SURFACE_FORMAT_R16G16_UNORM			0x000000da
-#define NV50_SURFACE_FORMAT_R16G16_SNORM			0x000000db
-#define NV50_SURFACE_FORMAT_R16G16_SINT				0x000000dc
-#define NV50_SURFACE_FORMAT_R16G16_UINT				0x000000dd
-#define NV50_SURFACE_FORMAT_R16G16_FLOAT			0x000000de
-#define NV50_SURFACE_FORMAT_A2R10G10B10_UNORM			0x000000df
-#define NV50_SURFACE_FORMAT_B10G11R11_FLOAT			0x000000e0
+#define NV50_SURFACE_FORMAT_BITMAP				0x0000001c
+#define NV50_SURFACE_FORMAT_UNK1D				0x0000001d
+#define NV50_SURFACE_FORMAT_RGBA32_FLOAT			0x000000c0
+#define NV50_SURFACE_FORMAT_RGBA32_SINT				0x000000c1
+#define NV50_SURFACE_FORMAT_RGBA32_UINT				0x000000c2
+#define NV50_SURFACE_FORMAT_RGBX32_FLOAT			0x000000c3
+#define NV50_SURFACE_FORMAT_RGBX32_SINT				0x000000c4
+#define NV50_SURFACE_FORMAT_RGBX32_UINT				0x000000c5
+#define NV50_SURFACE_FORMAT_RGBA16_UNORM			0x000000c6
+#define NV50_SURFACE_FORMAT_RGBA16_SNORM			0x000000c7
+#define NV50_SURFACE_FORMAT_RGBA16_SINT				0x000000c8
+#define NV50_SURFACE_FORMAT_RGBA16_UINT				0x000000c9
+#define NV50_SURFACE_FORMAT_RGBA16_FLOAT			0x000000ca
+#define NV50_SURFACE_FORMAT_RG32_FLOAT				0x000000cb
+#define NV50_SURFACE_FORMAT_RG32_SINT				0x000000cc
+#define NV50_SURFACE_FORMAT_RG32_UINT				0x000000cd
+#define NV50_SURFACE_FORMAT_RGBX16_FLOAT			0x000000ce
+#define NV50_SURFACE_FORMAT_BGRA8_UNORM				0x000000cf
+#define NV50_SURFACE_FORMAT_BGRA8_SRGB				0x000000d0
+#define NV50_SURFACE_FORMAT_RGB10_A2_UNORM			0x000000d1
+#define NV50_SURFACE_FORMAT_RGB10_A2_UINT			0x000000d2
+#define NV50_SURFACE_FORMAT_RGBA8_UNORM				0x000000d5
+#define NV50_SURFACE_FORMAT_RGBA8_SRGB				0x000000d6
+#define NV50_SURFACE_FORMAT_RGBA8_SNORM				0x000000d7
+#define NV50_SURFACE_FORMAT_RGBA8_SINT				0x000000d8
+#define NV50_SURFACE_FORMAT_RGBA8_UINT				0x000000d9
+#define NV50_SURFACE_FORMAT_RG16_UNORM				0x000000da
+#define NV50_SURFACE_FORMAT_RG16_SNORM				0x000000db
+#define NV50_SURFACE_FORMAT_RG16_SINT				0x000000dc
+#define NV50_SURFACE_FORMAT_RG16_UINT				0x000000dd
+#define NV50_SURFACE_FORMAT_RG16_FLOAT				0x000000de
+#define NV50_SURFACE_FORMAT_BGR10_A2_UNORM			0x000000df
+#define NV50_SURFACE_FORMAT_R11G11B10_FLOAT			0x000000e0
+#define NV50_SURFACE_FORMAT_R32_SINT				0x000000e3
+#define NV50_SURFACE_FORMAT_R32_UINT				0x000000e4
 #define NV50_SURFACE_FORMAT_R32_FLOAT				0x000000e5
-#define NV50_SURFACE_FORMAT_X8R8G8B8_UNORM			0x000000e6
-#define NV50_SURFACE_FORMAT_X8R8G8B8_SRGB			0x000000e7
-#define NV50_SURFACE_FORMAT_R5G6B5_UNORM			0x000000e8
-#define NV50_SURFACE_FORMAT_A1R5G5B5_UNORM			0x000000e9
-#define NV50_SURFACE_FORMAT_R8G8_UNORM				0x000000ea
-#define NV50_SURFACE_FORMAT_R8G8_SNORM				0x000000eb
-#define NV50_SURFACE_FORMAT_R8G8_SINT				0x000000ec
-#define NV50_SURFACE_FORMAT_R8G8_UINT				0x000000ed
+#define NV50_SURFACE_FORMAT_BGRX8_UNORM				0x000000e6
+#define NV50_SURFACE_FORMAT_BGRX8_SRGB				0x000000e7
+#define NV50_SURFACE_FORMAT_B5G6R5_UNORM			0x000000e8
+#define NV50_SURFACE_FORMAT_BGR5_A1_UNORM			0x000000e9
+#define NV50_SURFACE_FORMAT_RG8_UNORM				0x000000ea
+#define NV50_SURFACE_FORMAT_RG8_SNORM				0x000000eb
+#define NV50_SURFACE_FORMAT_RG8_SINT				0x000000ec
+#define NV50_SURFACE_FORMAT_RG8_UINT				0x000000ed
 #define NV50_SURFACE_FORMAT_R16_UNORM				0x000000ee
 #define NV50_SURFACE_FORMAT_R16_SNORM				0x000000ef
 #define NV50_SURFACE_FORMAT_R16_SINT				0x000000f0
@@ -118,19 +125,24 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define NV50_SURFACE_FORMAT_R8_SINT				0x000000f5
 #define NV50_SURFACE_FORMAT_R8_UINT				0x000000f6
 #define NV50_SURFACE_FORMAT_A8_UNORM				0x000000f7
-#define NV50_SURFACE_FORMAT_X1R5G5B5_UNORM			0x000000f8
-#define NV50_SURFACE_FORMAT_X8B8G8R8_UNORM			0x000000f9
-#define NV50_SURFACE_FORMAT_X8B8G8R8_SRGB			0x000000fa
+#define NV50_SURFACE_FORMAT_BGR5_X1_UNORM			0x000000f8
+#define NV50_SURFACE_FORMAT_RGBX8_UNORM				0x000000f9
+#define NV50_SURFACE_FORMAT_RGBX8_SRGB				0x000000fa
+#define NV50_SURFACE_FORMAT_BGR5_X1_UNORM_UNKFB			0x000000fb
+#define NV50_SURFACE_FORMAT_BGR5_X1_UNORM_UNKFC			0x000000fc
+#define NV50_SURFACE_FORMAT_BGRX8_UNORM_UNKFD			0x000000fd
+#define NV50_SURFACE_FORMAT_BGRX8_UNORM_UNKFE			0x000000fe
+#define NV50_SURFACE_FORMAT_Y32_UINT_UNKFF			0x000000ff
 #define NV50_ZETA_FORMAT_Z32_FLOAT				0x0000000a
 #define NV50_ZETA_FORMAT_Z16_UNORM				0x00000013
-#define NV50_ZETA_FORMAT_Z24S8_UNORM				0x00000014
-#define NV50_ZETA_FORMAT_X8Z24_UNORM				0x00000015
-#define NV50_ZETA_FORMAT_S8Z24_UNORM				0x00000016
-#define NV50_ZETA_FORMAT_UNK18					0x00000018
-#define NV50_ZETA_FORMAT_Z32_FLOAT_X24S8_UNORM			0x00000019
-#define NV50_ZETA_FORMAT_UNK1D					0x0000001d
-#define NV50_ZETA_FORMAT_UNK1E					0x0000001e
-#define NV50_ZETA_FORMAT_UNK1F					0x0000001f
+#define NV50_ZETA_FORMAT_S8_Z24_UNORM				0x00000014
+#define NV50_ZETA_FORMAT_Z24_X8_UNORM				0x00000015
+#define NV50_ZETA_FORMAT_Z24_S8_UNORM				0x00000016
+#define NV50_ZETA_FORMAT_Z24_C8_UNORM				0x00000018
+#define NV50_ZETA_FORMAT_Z32_S8_X24_FLOAT			0x00000019
+#define NV50_ZETA_FORMAT_Z24_X8_S8_C8_X16_UNORM			0x0000001d
+#define NV50_ZETA_FORMAT_Z32_X8_C8_X16_FLOAT			0x0000001e
+#define NV50_ZETA_FORMAT_Z32_S8_C8_X16_FLOAT			0x0000001f
 #define NV50_QUERY__SIZE					0x00000010
 #define NV50_QUERY_COUNTER					0x00000000
 
@@ -139,4 +151,4 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define NV50_QUERY_TIME						0x00000008
 
 
-#endif /* NV50_DEFS_XML */
+#endif /* RNNDB_NV50_DEFS_XML */