nv50,nvc0: extensive surface format renaming to get consistency

Now the component ordering is consistent and matches gallium again.

1 files changed, 48 insertions, 33 deletions

diff --git a/src/gallium/drivers/nv50/nv50_texture.xml.h b/src/gallium/drivers/nv50/nv50_texture.xml.h
index e0cbbdf0d7b..08f6efdd7bf 100644
--- a/src/gallium/drivers/nv50/nv50_texture.xml.h
+++ b/src/gallium/drivers/nv50/nv50_texture.xml.h
@@ -1,5 +1,5 @@
-#ifndef NV50_TEXTURE_XML
-#define NV50_TEXTURE_XML
+#ifndef RNNDB_NV50_TEXTURE_XML
+#define RNNDB_NV50_TEXTURE_XML
 
 /* Autogenerated file, DO NOT EDIT manually!
 
@@ -8,8 +8,10 @@ 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_texture.xml (   8377 bytes, from 2011-02-12 12:05:21)
-- copyright.xml    (   6452 bytes, from 2010-11-25 23:28:20)
+- rnndb/nv50_texture.xml (   7947 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)
+- ./rnndb/nv50_defs.xml  (   5468 bytes, from 2011-07-09 13:43:58)
 
 Copyright (C) 2006-2011 by the following authors:
 - Artur Huillet <[email protected]> (ahuillet)
@@ -115,52 +117,52 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define NV50_TIC_0_FMT_32_32_32_32				0x00000001
 #define NV50_TIC_0_FMT_16_16_16_16				0x00000003
 #define NV50_TIC_0_FMT_32_32					0x00000004
-#define NV50_TIC_0_FMT_32_8					0x00000005
+#define NV50_TIC_0_FMT_32_8_X24					0x00000005
 #define NV50_TIC_0_FMT_8_8_8_8					0x00000008
-#define NV50_TIC_0_FMT_2_10_10_10				0x00000009
+#define NV50_TIC_0_FMT_10_10_10_2				0x00000009
 #define NV50_TIC_0_FMT_16_16					0x0000000c
-#define NV50_TIC_0_FMT_8_24					0x0000000d
-#define NV50_TIC_0_FMT_24_8					0x0000000e
+#define NV50_TIC_0_FMT_24_8					0x0000000d
+#define NV50_TIC_0_FMT_8_24					0x0000000e
 #define NV50_TIC_0_FMT_32					0x0000000f
 #define NV50_TIC_0_FMT_BPTC_FLOAT				0x00000010
 #define NV50_TIC_0_FMT_BPTC_UFLOAT				0x00000011
 #define NV50_TIC_0_FMT_4_4_4_4					0x00000012
-#define NV50_TIC_0_FMT_5_5_5_1					0x00000013
-#define NV50_TIC_0_FMT_1_5_5_5					0x00000014
+#define NV50_TIC_0_FMT_1_5_5_5					0x00000013
+#define NV50_TIC_0_FMT_5_5_5_1					0x00000014
 #define NV50_TIC_0_FMT_5_6_5					0x00000015
-#define NV50_TIC_0_FMT_6_5_5					0x00000016
+#define NV50_TIC_0_FMT_5_5_6					0x00000016
 #define NV50_TIC_0_FMT_BPTC					0x00000017
 #define NV50_TIC_0_FMT_8_8					0x00000018
 #define NV50_TIC_0_FMT_16					0x0000001b
 #define NV50_TIC_0_FMT_8					0x0000001d
 #define NV50_TIC_0_FMT_4_4					0x0000001e
-#define NV50_TIC_0_FMT_BITMAP_8X8				0x0000001f
-#define NV50_TIC_0_FMT_E5_9_9_9					0x00000020
-#define NV50_TIC_0_FMT_10_11_11					0x00000021
-#define NV50_TIC_0_FMT_C1_C2_C1_C0				0x00000022
-#define NV50_TIC_0_FMT_C2_C1_C0_C1				0x00000023
+#define NV50_TIC_0_FMT_BITMAP					0x0000001f
+#define NV50_TIC_0_FMT_9_9_9_E5					0x00000020
+#define NV50_TIC_0_FMT_11_11_10					0x00000021
+#define NV50_TIC_0_FMT_U8_YA8_V8_YB8				0x00000022
+#define NV50_TIC_0_FMT_YA8_U8_YB8_V8				0x00000023
 #define NV50_TIC_0_FMT_DXT1					0x00000024
 #define NV50_TIC_0_FMT_DXT3					0x00000025
 #define NV50_TIC_0_FMT_DXT5					0x00000026
 #define NV50_TIC_0_FMT_RGTC1					0x00000027
 #define NV50_TIC_0_FMT_RGTC2					0x00000028
-#define NV50_TIC_0_FMT_Z24S8					0x00000029
-#define NV50_TIC_0_FMT_S8Z24					0x0000002a
-#define NV50_TIC_0_FMT_X8Z24					0x0000002b
-#define NV50_TIC_0_FMT_C8Z24_MS4_CS4				0x0000002c
-#define NV50_TIC_0_FMT_C8Z24_MS8_CS8				0x0000002d
-#define NV50_TIC_0_FMT_C8Z24_MS4_CS12				0x0000002e
+#define NV50_TIC_0_FMT_S8_Z24					0x00000029
+#define NV50_TIC_0_FMT_Z24_S8					0x0000002a
+#define NV50_TIC_0_FMT_Z24_X8					0x0000002b
+#define NV50_TIC_0_FMT_Z24_C8_MS4_CS4				0x0000002c
+#define NV50_TIC_0_FMT_Z24_C8_MS8_CS8				0x0000002d
+#define NV50_TIC_0_FMT_Z24_C8_MS4_CS12				0x0000002e
 #define NV50_TIC_0_FMT_Z32					0x0000002f
-#define NV50_TIC_0_FMT_X24S8Z32					0x00000030
-#define NV50_TIC_0_FMT_X16C8S8X8Z24_MS4_CS4			0x00000031
-#define NV50_TIC_0_FMT_X16C8S8X8Z24_MS8_CS8			0x00000032
-#define NV50_TIC_0_FMT_X16C8X8Z32_MS4_CS4			0x00000033
-#define NV50_TIC_0_FMT_X16C8X8Z32_MS8_CS8			0x00000034
-#define NV50_TIC_0_FMT_X16C8S8Z32_MS4_CS4			0x00000035
-#define NV50_TIC_0_FMT_X16C8S8Z32_MS8_CS8			0x00000036
-#define NV50_TIC_0_FMT_X16C8S8X8Z24_MS4_CS12			0x00000037
-#define NV50_TIC_0_FMT_X16C8X8Z32_MS4_CS12			0x00000038
-#define NV50_TIC_0_FMT_X16C8S8Z32_MS4_CS12			0x00000039
+#define NV50_TIC_0_FMT_Z32_S8_X24				0x00000030
+#define NV50_TIC_0_FMT_Z24_X8_S8_C8_X16_MS4_CS4			0x00000031
+#define NV50_TIC_0_FMT_Z24_X8_S8_C8_X16_MS8_CS8			0x00000032
+#define NV50_TIC_0_FMT_Z32_X8_C8_X16_MS4_CS4			0x00000033
+#define NV50_TIC_0_FMT_Z32_X8_C8_X16_MS8_CS8			0x00000034
+#define NV50_TIC_0_FMT_Z32_S8_C8_X16_MS4_CS4			0x00000035
+#define NV50_TIC_0_FMT_Z32_S8_C8_X16_MS8_CS8			0x00000036
+#define NV50_TIC_0_FMT_Z24_X8_S8_C8_X16_MS4_CS12		0x00000037
+#define NV50_TIC_0_FMT_Z32_X8_C8_X16_MS4_CS12			0x00000038
+#define NV50_TIC_0_FMT_Z32_S8_C8_X16_MS4_CS12			0x00000039
 #define NV50_TIC_0_FMT_Z16					0x0000003a
 
 #define NV50_TIC_1						0x00000004
@@ -215,6 +217,19 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define NV50_TIC_7_BASE_LEVEL__SHIFT				0
 #define NV50_TIC_7_MAX_LEVEL__MASK				0x000000f0
 #define NV50_TIC_7_MAX_LEVEL__SHIFT				4
+#define NV50_TIC_7_MS_MODE__MASK				0x0000f000
+#define NV50_TIC_7_MS_MODE__SHIFT				12
+#define NV50_TIC_7_MS_MODE_MS1					0x00000000
+#define NV50_TIC_7_MS_MODE_MS2					0x00001000
+#define NV50_TIC_7_MS_MODE_MS4					0x00002000
+#define NV50_TIC_7_MS_MODE_MS8					0x00003000
+#define NVA3_TIC_7_MS_MODE_MS8_ALT				0x00004000
+#define NVA3_TIC_7_MS_MODE_MS2_ALT				0x00005000
+#define NVC0_TIC_7_MS_MODE_UNK6					0x00006000
+#define NV50_TIC_7_MS_MODE_MS4_CS4				0x00008000
+#define NV50_TIC_7_MS_MODE_MS4_CS12				0x00009000
+#define NV50_TIC_7_MS_MODE_MS8_CS8				0x0000a000
+#define NVC0_TIC_7_MS_MODE_MS8_CS24				0x0000b000
 
 #define NV50_TSC__SIZE						0x00000020
 #define NV50_TSC_0						0x00000000
@@ -276,4 +291,4 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define NV50_TSC_7_BORDER_COLOR_ALPHA__SHIFT			0
 
 
-#endif /* NV50_TEXTURE_XML */
+#endif /* RNNDB_NV50_TEXTURE_XML */