etnaviv: Update hw header files

Update from etnaviv repository rnndb. This adds some newly
discovered state for GC3000 (and some GC2000) features.

Signed-off-by: Wladimir J. van der Laan <[email protected]>
Acked-by: Christian Gmeiner <[email protected]>

5 files changed, 160 insertions, 48 deletions

diff --git a/src/gallium/drivers/etnaviv/hw/cmdstream.xml.h b/src/gallium/drivers/etnaviv/hw/cmdstream.xml.h
index c5275db065d..4e78eba6945 100644
--- a/src/gallium/drivers/etnaviv/hw/cmdstream.xml.h
+++ b/src/gallium/drivers/etnaviv/hw/cmdstream.xml.h
@@ -8,9 +8,9 @@ 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:
-- cmdstream.xml (  14094 bytes, from 2016-11-16 18:54:37)
-- copyright.xml (   1597 bytes, from 2016-10-02 14:26:13)
-- common.xml    (  23422 bytes, from 2016-11-16 18:54:37)
+- cmdstream.xml (  14313 bytes, from 2016-11-17 18:46:23)
+- copyright.xml (   1597 bytes, from 2016-10-29 07:29:22)
+- common.xml    (  23473 bytes, from 2016-12-11 10:32:13)
 
 Copyright (C) 2012-2016 by the following authors:
 - Wladimir J. van der Laan <[email protected]>
diff --git a/src/gallium/drivers/etnaviv/hw/common.xml.h b/src/gallium/drivers/etnaviv/hw/common.xml.h
index 8d8ef7d4fce..0f99db275de 100644
--- a/src/gallium/drivers/etnaviv/hw/common.xml.h
+++ b/src/gallium/drivers/etnaviv/hw/common.xml.h
@@ -8,13 +8,13 @@ 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:
-- state.xml     (  19792 bytes, from 2016-11-16 18:54:37)
-- common.xml    (  23422 bytes, from 2016-11-16 18:54:37)
-- state_hi.xml  (  25653 bytes, from 2016-10-02 14:26:13)
-- copyright.xml (   1597 bytes, from 2016-10-02 14:26:13)
-- state_2d.xml  (  51552 bytes, from 2016-10-02 14:26:13)
-- state_3d.xml  (  57579 bytes, from 2016-11-16 18:54:37)
-- state_vg.xml  (   5975 bytes, from 2016-10-02 14:26:13)
+- state.xml     (  19930 bytes, from 2016-12-14 15:25:40)
+- common.xml    (  23473 bytes, from 2016-12-11 10:32:13)
+- state_hi.xml  (  26403 bytes, from 2016-12-14 06:43:27)
+- copyright.xml (   1597 bytes, from 2016-10-29 07:29:22)
+- state_2d.xml  (  51552 bytes, from 2016-10-29 07:29:22)
+- state_3d.xml  (  66957 bytes, from 2016-12-15 11:31:03)
+- state_vg.xml  (   5975 bytes, from 2016-10-29 07:29:22)
 
 Copyright (C) 2012-2016 by the following authors:
 - Wladimir J. van der Laan <[email protected]>
diff --git a/src/gallium/drivers/etnaviv/hw/isa.xml.h b/src/gallium/drivers/etnaviv/hw/isa.xml.h
index 70cc74a93ed..c604b4407d4 100644
--- a/src/gallium/drivers/etnaviv/hw/isa.xml.h
+++ b/src/gallium/drivers/etnaviv/hw/isa.xml.h
@@ -8,8 +8,8 @@ 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:
-- isa.xml       (  24392 bytes, from 2016-11-16 18:54:37)
-- copyright.xml (   1597 bytes, from 2016-10-02 14:26:13)
+- isa.xml       (  30048 bytes, from 2016-12-12 13:26:33)
+- copyright.xml (   1597 bytes, from 2016-10-29 07:29:22)
 
 Copyright (C) 2012-2016 by the following authors:
 - Wladimir J. van der Laan <[email protected]>
@@ -78,6 +78,7 @@ DEALINGS IN THE SOFTWARE.
 #define INST_OPCODE_CEIL					0x00000026
 #define INST_OPCODE_SIGN					0x00000027
 #define INST_OPCODE_I2F						0x0000002d
+#define INST_OPCODE_F2I						0x0000002e
 #define INST_OPCODE_CMP						0x00000031
 #define INST_OPCODE_LOAD					0x00000032
 #define INST_OPCODE_STORE					0x00000033
@@ -92,6 +93,7 @@ DEALINGS IN THE SOFTWARE.
 #define INST_OPCODE_AND						0x0000005d
 #define INST_OPCODE_XOR						0x0000005e
 #define INST_OPCODE_NOT						0x0000005f
+#define INST_OPCODE_POPCOUNT					0x00000061
 #define INST_CONDITION_TRUE					0x00000000
 #define INST_CONDITION_GT					0x00000001
 #define INST_CONDITION_LT					0x00000002
diff --git a/src/gallium/drivers/etnaviv/hw/state.xml.h b/src/gallium/drivers/etnaviv/hw/state.xml.h
index d9bb9c4eab5..73ef042d575 100644
--- a/src/gallium/drivers/etnaviv/hw/state.xml.h
+++ b/src/gallium/drivers/etnaviv/hw/state.xml.h
@@ -8,13 +8,13 @@ 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:
-- state.xml     (  19792 bytes, from 2016-11-16 18:54:37)
-- common.xml    (  23422 bytes, from 2016-11-16 18:54:37)
-- state_hi.xml  (  25653 bytes, from 2016-10-02 14:26:13)
-- copyright.xml (   1597 bytes, from 2016-10-02 14:26:13)
-- state_2d.xml  (  51552 bytes, from 2016-10-02 14:26:13)
-- state_3d.xml  (  57579 bytes, from 2016-11-16 18:54:37)
-- state_vg.xml  (   5975 bytes, from 2016-10-02 14:26:13)
+- state.xml     (  19930 bytes, from 2016-12-14 15:25:40)
+- common.xml    (  23473 bytes, from 2016-12-11 10:32:13)
+- state_hi.xml  (  26403 bytes, from 2016-12-14 06:43:27)
+- copyright.xml (   1597 bytes, from 2016-10-29 07:29:22)
+- state_2d.xml  (  51552 bytes, from 2016-10-29 07:29:22)
+- state_3d.xml  (  66957 bytes, from 2016-12-15 11:31:03)
+- state_vg.xml  (   5975 bytes, from 2016-10-29 07:29:22)
 
 Copyright (C) 2012-2016 by the following authors:
 - Wladimir J. van der Laan <[email protected]>
@@ -377,17 +377,15 @@ DEALINGS IN THE SOFTWARE.
 
 #define VIVS_NFE						0x00000000
 
-#define VIVS_NFE_UNK14600(i0)				       (0x00014600 + 0x4*(i0))
-#define VIVS_NFE_UNK14600__ESIZE				0x00000004
-#define VIVS_NFE_UNK14600__LEN					0x00000010
+#define VIVS_NFE_VERTEX_STREAMS(i0)			       (0x00000000 + 0x4*(i0))
+#define VIVS_NFE_VERTEX_STREAMS__ESIZE				0x00000004
+#define VIVS_NFE_VERTEX_STREAMS__LEN				0x00000010
 
-#define VIVS_NFE_UNK14640(i0)				       (0x00014640 + 0x4*(i0))
-#define VIVS_NFE_UNK14640__ESIZE				0x00000004
-#define VIVS_NFE_UNK14640__LEN					0x00000010
+#define VIVS_NFE_VERTEX_STREAMS_BASE_ADDR(i0)		       (0x00014600 + 0x4*(i0))
 
-#define VIVS_NFE_UNK14680(i0)				       (0x00014680 + 0x4*(i0))
-#define VIVS_NFE_UNK14680__ESIZE				0x00000004
-#define VIVS_NFE_UNK14680__LEN					0x00000010
+#define VIVS_NFE_VERTEX_STREAMS_CONTROL(i0)		       (0x00014640 + 0x4*(i0))
+
+#define VIVS_NFE_VERTEX_STREAMS_UNK14680(i0)		       (0x00014680 + 0x4*(i0))
 
 #define VIVS_DUMMY						0x00000000
 
diff --git a/src/gallium/drivers/etnaviv/hw/state_3d.xml.h b/src/gallium/drivers/etnaviv/hw/state_3d.xml.h
index 41bbd0c2dde..a56c4a81777 100644
--- a/src/gallium/drivers/etnaviv/hw/state_3d.xml.h
+++ b/src/gallium/drivers/etnaviv/hw/state_3d.xml.h
@@ -8,13 +8,13 @@ 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:
-- state.xml     (  19792 bytes, from 2016-11-16 18:54:37)
-- common.xml    (  23422 bytes, from 2016-11-16 18:54:37)
-- state_hi.xml  (  25653 bytes, from 2016-10-02 14:26:13)
-- copyright.xml (   1597 bytes, from 2016-10-02 14:26:13)
-- state_2d.xml  (  51552 bytes, from 2016-10-02 14:26:13)
-- state_3d.xml  (  57579 bytes, from 2016-11-16 18:54:37)
-- state_vg.xml  (   5975 bytes, from 2016-10-02 14:26:13)
+- state.xml     (  19930 bytes, from 2016-12-14 15:25:40)
+- common.xml    (  23473 bytes, from 2016-12-11 10:32:13)
+- state_hi.xml  (  26403 bytes, from 2016-12-14 06:43:27)
+- copyright.xml (   1597 bytes, from 2016-10-29 07:29:22)
+- state_2d.xml  (  51552 bytes, from 2016-10-29 07:29:22)
+- state_3d.xml  (  66957 bytes, from 2016-12-15 11:31:03)
+- state_vg.xml  (   5975 bytes, from 2016-10-29 07:29:22)
 
 Copyright (C) 2012-2016 by the following authors:
 - Wladimir J. van der Laan <[email protected]>
@@ -87,6 +87,21 @@ DEALINGS IN THE SOFTWARE.
 #define RS_FORMAT_X8R8G8B8					0x00000005
 #define RS_FORMAT_A8R8G8B8					0x00000006
 #define RS_FORMAT_YUY2						0x00000007
+#define RS_FORMAT_R16F						0x00000011
+#define RS_FORMAT_X16R16F					0x00000012
+#define RS_FORMAT_X16B16G16R16F					0x00000013
+#define RS_FORMAT_R32F						0x00000014
+#define RS_FORMAT_X32R32F					0x00000015
+#define RS_FORMAT_A2B10G10R10					0x00000016
+#define RS_FORMAT_R8I						0x00000017
+#define RS_FORMAT_X8R8I						0x00000018
+#define RS_FORMAT_X8B8G8R8I					0x00000019
+#define RS_FORMAT_R16I						0x0000001a
+#define RS_FORMAT_X16R16I					0x0000001b
+#define RS_FORMAT_X16B16G16R16I					0x0000001c
+#define RS_FORMAT_B10G11R11F					0x0000001d
+#define RS_FORMAT_A2B10G10R10UI					0x0000001e
+#define RS_FORMAT_G8R8						0x0000001f
 #define TEXTURE_FORMAT_NONE					0x00000000
 #define TEXTURE_FORMAT_A8					0x00000001
 #define TEXTURE_FORMAT_L8					0x00000002
@@ -108,14 +123,35 @@ DEALINGS IN THE SOFTWARE.
 #define TEXTURE_FORMAT_DXT1					0x00000013
 #define TEXTURE_FORMAT_DXT2_DXT3				0x00000014
 #define TEXTURE_FORMAT_DXT4_DXT5				0x00000015
+#define TEXTURE_FORMAT_E5B9G9R9					0x0000001d
 #define TEXTURE_FORMAT_ETC1					0x0000001e
 #define TEXTURE_FORMAT_EXT_NONE					0x00000000
+#define TEXTURE_FORMAT_EXT_RGB8_PUNCHTHROUGH_ALPHA1_ETC2	0x00000001
+#define TEXTURE_FORMAT_EXT_RGBA8_ETC2_EAC			0x00000002
+#define TEXTURE_FORMAT_EXT_R11_EAC				0x00000003
+#define TEXTURE_FORMAT_EXT_RG11_EAC				0x00000004
+#define TEXTURE_FORMAT_EXT_SIGNED_RG11_EAC			0x00000005
+#define TEXTURE_FORMAT_EXT_G8R8					0x00000006
 #define TEXTURE_FORMAT_EXT_A16F					0x00000007
 #define TEXTURE_FORMAT_EXT_A16L16F				0x00000008
 #define TEXTURE_FORMAT_EXT_A16B16G16R16F			0x00000009
 #define TEXTURE_FORMAT_EXT_A32F					0x0000000a
 #define TEXTURE_FORMAT_EXT_A32L32F				0x0000000b
 #define TEXTURE_FORMAT_EXT_A2B10G10R10				0x0000000c
+#define TEXTURE_FORMAT_EXT_SIGNED_R11_EAC			0x0000000d
+#define TEXTURE_FORMAT_EXT_R8_SNORM				0x0000000e
+#define TEXTURE_FORMAT_EXT_G8R8_SNORM				0x0000000f
+#define TEXTURE_FORMAT_EXT_X8B8G8R8_SNORM			0x00000010
+#define TEXTURE_FORMAT_EXT_A8B8G8R8_SNORM			0x00000011
+#define TEXTURE_FORMAT_EXT_ASTC					0x00000014
+#define TEXTURE_FORMAT_EXT_R8I					0x00000015
+#define TEXTURE_FORMAT_EXT_G8R8I				0x00000016
+#define TEXTURE_FORMAT_EXT_A8B8G8R8I				0x00000017
+#define TEXTURE_FORMAT_EXT_R16I					0x00000018
+#define TEXTURE_FORMAT_EXT_G16R16I				0x00000019
+#define TEXTURE_FORMAT_EXT_A16B16G16R16I			0x0000001a
+#define TEXTURE_FORMAT_EXT_B10G11R11F				0x0000001b
+#define TEXTURE_FORMAT_EXT_A2B10G10R10UI			0x0000001c
 #define TEXTURE_FILTER_NONE					0x00000000
 #define TEXTURE_FILTER_NEAREST					0x00000001
 #define TEXTURE_FILTER_LINEAR					0x00000002
@@ -243,12 +279,18 @@ DEALINGS IN THE SOFTWARE.
 #define VIVS_VS_RANGE_HIGH(x)					(((x) << VIVS_VS_RANGE_HIGH__SHIFT) & VIVS_VS_RANGE_HIGH__MASK)
 
 #define VIVS_VS_NEW_UNK00860					0x00000860
+#define VIVS_VS_NEW_UNK00860_UNK0				0x00000001
+#define VIVS_VS_NEW_UNK00860_PS					0x00000010
+#define VIVS_VS_NEW_UNK00860_UNK12				0x00001000
 
-#define VIVS_VS_UNK00864					0x00000864
+#define VIVS_VS_UNIFORM_BASE					0x00000864
 
-#define VIVS_VS_UNK00868					0x00000868
+#define VIVS_VS_ICACHE_CONTROL					0x00000868
+#define VIVS_VS_ICACHE_CONTROL_ENABLE				0x00000001
+#define VIVS_VS_ICACHE_CONTROL_FLUSH_VS				0x00000010
+#define VIVS_VS_ICACHE_CONTROL_FLUSH_PS				0x00000020
 
-#define VIVS_VS_UNK0086C					0x0000086c
+#define VIVS_VS_INST_ADDR					0x0000086c
 
 #define VIVS_VS_INST_MEM(i0)				       (0x00004000 + 0x4*(i0))
 #define VIVS_VS_INST_MEM__ESIZE					0x00000004
@@ -337,6 +379,18 @@ DEALINGS IN THE SOFTWARE.
 
 #define VIVS_CL_UNK00924					0x00000924
 
+#define VIVS_CL_UNK00940					0x00000940
+
+#define VIVS_CL_UNK00944					0x00000944
+
+#define VIVS_CL_UNK00948					0x00000948
+
+#define VIVS_CL_UNK0094C					0x0000094c
+
+#define VIVS_CL_UNK00950					0x00000950
+
+#define VIVS_CL_UNK00954					0x00000954
+
 #define VIVS_PA							0x00000000
 
 #define VIVS_PA_VIEWPORT_SCALE_X				0x00000a00
@@ -503,11 +557,14 @@ DEALINGS IN THE SOFTWARE.
 #define VIVS_PS_RANGE_HIGH__SHIFT				16
 #define VIVS_PS_RANGE_HIGH(x)					(((x) << VIVS_PS_RANGE_HIGH__SHIFT) & VIVS_PS_RANGE_HIGH__MASK)
 
-#define VIVS_PS_UNK01024					0x00001024
+#define VIVS_PS_UNIFORM_BASE					0x00001024
 
-#define VIVS_PS_UNK01028					0x00001028
+#define VIVS_PS_INST_ADDR					0x00001028
 
-#define VIVS_PS_UNK01030					0x00001030
+#define VIVS_PS_CONTROL_EXT					0x00001030
+#define VIVS_PS_CONTROL_EXT_COLOR_OUTPUT_COUNT__MASK		0x00000003
+#define VIVS_PS_CONTROL_EXT_COLOR_OUTPUT_COUNT__SHIFT		0
+#define VIVS_PS_CONTROL_EXT_COLOR_OUTPUT_COUNT(x)		(((x) << VIVS_PS_CONTROL_EXT_COLOR_OUTPUT_COUNT__SHIFT) & VIVS_PS_CONTROL_EXT_COLOR_OUTPUT_COUNT__MASK)
 
 #define VIVS_PS_INST_MEM(i0)				       (0x00006000 + 0x4*(i0))
 #define VIVS_PS_INST_MEM__ESIZE					0x00000004
@@ -540,6 +597,7 @@ DEALINGS IN THE SOFTWARE.
 #define VIVS_PE_DEPTH_CONFIG_EARLY_Z				0x00010000
 #define VIVS_PE_DEPTH_CONFIG_EARLY_Z_MASK			0x00020000
 #define VIVS_PE_DEPTH_CONFIG_UNK18				0x00040000
+#define VIVS_PE_DEPTH_CONFIG_UNK18_MASK				0x00080000
 #define VIVS_PE_DEPTH_CONFIG_ONLY_DEPTH				0x00100000
 #define VIVS_PE_DEPTH_CONFIG_ONLY_DEPTH_MASK			0x00200000
 #define VIVS_PE_DEPTH_CONFIG_DISABLE_ZS				0x01000000
@@ -680,8 +738,10 @@ DEALINGS IN THE SOFTWARE.
 #define VIVS_PE_COLOR_FORMAT_OVERWRITE_MASK			0x00020000
 #define VIVS_PE_COLOR_FORMAT_SUPER_TILED			0x00100000
 #define VIVS_PE_COLOR_FORMAT_SUPER_TILED_MASK			0x00200000
-#define VIVS_PE_COLOR_FORMAT_UNK25				0x02000000
-#define VIVS_PE_COLOR_FORMAT_UNK26				0x04000000
+#define VIVS_PE_COLOR_FORMAT_FORMAT_EXT__MASK			0x3f000000
+#define VIVS_PE_COLOR_FORMAT_FORMAT_EXT__SHIFT			24
+#define VIVS_PE_COLOR_FORMAT_FORMAT_EXT(x)			(((x) << VIVS_PE_COLOR_FORMAT_FORMAT_EXT__SHIFT) & VIVS_PE_COLOR_FORMAT_FORMAT_EXT__MASK)
+#define VIVS_PE_COLOR_FORMAT_FORMAT_EXT_MASK			0x80000000
 
 #define VIVS_PE_COLOR_ADDR					0x00001430
 
@@ -725,6 +785,20 @@ DEALINGS IN THE SOFTWARE.
 #define VIVS_PE_LOGIC_OP_OP__SHIFT				0
 #define VIVS_PE_LOGIC_OP_OP(x)					(((x) << VIVS_PE_LOGIC_OP_OP__SHIFT) & VIVS_PE_LOGIC_OP_OP__MASK)
 #define VIVS_PE_LOGIC_OP_OP_MASK				0x00000010
+#define VIVS_PE_LOGIC_OP_SINGLE_BUFFER_MASK			0x00000080
+#define VIVS_PE_LOGIC_OP_SINGLE_BUFFER__MASK			0x00000300
+#define VIVS_PE_LOGIC_OP_SINGLE_BUFFER__SHIFT			8
+#define VIVS_PE_LOGIC_OP_SINGLE_BUFFER(x)			(((x) << VIVS_PE_LOGIC_OP_SINGLE_BUFFER__SHIFT) & VIVS_PE_LOGIC_OP_SINGLE_BUFFER__MASK)
+#define VIVS_PE_LOGIC_OP_UNK11_MASK				0x00000400
+#define VIVS_PE_LOGIC_OP_UNK11					0x00000800
+#define VIVS_PE_LOGIC_OP_UNK20__MASK				0x00300000
+#define VIVS_PE_LOGIC_OP_UNK20__SHIFT				20
+#define VIVS_PE_LOGIC_OP_UNK20(x)				(((x) << VIVS_PE_LOGIC_OP_UNK20__SHIFT) & VIVS_PE_LOGIC_OP_UNK20__MASK)
+#define VIVS_PE_LOGIC_OP_UNK20_MASK				0x00800000
+#define VIVS_PE_LOGIC_OP_UNK24__MASK				0x07000000
+#define VIVS_PE_LOGIC_OP_UNK24__SHIFT				24
+#define VIVS_PE_LOGIC_OP_UNK24(x)				(((x) << VIVS_PE_LOGIC_OP_UNK24__SHIFT) & VIVS_PE_LOGIC_OP_UNK24__MASK)
+#define VIVS_PE_LOGIC_OP_UNK24_MASK				0x08000000
 
 #define VIVS_PE_DITHER(i0)				       (0x000014a8 + 0x4*(i0))
 #define VIVS_PE_DITHER__ESIZE					0x00000004
@@ -758,6 +832,24 @@ DEALINGS IN THE SOFTWARE.
 #define VIVS_PE_UNK01580__ESIZE					0x00000004
 #define VIVS_PE_UNK01580__LEN					0x00000003
 
+#define VIVS_PE_RT_ADDR(i0)				       (0x00000000 + 0x20*(i0))
+#define VIVS_PE_RT_ADDR__ESIZE					0x00000020
+#define VIVS_PE_RT_ADDR__LEN					0x00000008
+
+#define VIVS_PE_RT_ADDR_PIPE(i0, i1)			       (0x00014800 + 0x20*(i0) + 0x4*(i1))
+#define VIVS_PE_RT_ADDR_PIPE__ESIZE				0x00000004
+#define VIVS_PE_RT_ADDR_PIPE__LEN				0x00000008
+
+#define VIVS_PE_RT_CONFIG(i0)				       (0x00014900 + 0x4*(i0))
+#define VIVS_PE_RT_CONFIG__ESIZE				0x00000004
+#define VIVS_PE_RT_CONFIG__LEN					0x00000008
+#define VIVS_PE_RT_CONFIG_STRIDE__MASK				0x0000ffff
+#define VIVS_PE_RT_CONFIG_STRIDE__SHIFT				0
+#define VIVS_PE_RT_CONFIG_STRIDE(x)				(((x) << VIVS_PE_RT_CONFIG_STRIDE__SHIFT) & VIVS_PE_RT_CONFIG_STRIDE__MASK)
+#define VIVS_PE_RT_CONFIG_UNK16__MASK				0xffff0000
+#define VIVS_PE_RT_CONFIG_UNK16__SHIFT				16
+#define VIVS_PE_RT_CONFIG_UNK16(x)				(((x) << VIVS_PE_RT_CONFIG_UNK16__SHIFT) & VIVS_PE_RT_CONFIG_UNK16__MASK)
+
 #define VIVS_CO							0x00000000
 
 #define VIVS_CO_UNK03008					0x00003008
@@ -979,6 +1071,24 @@ DEALINGS IN THE SOFTWARE.
 
 #define VIVS_TS_SAMPLER_CLEAR_VALUE(i0)			       (0x00001760 + 0x4*(i0))
 
+#define VIVS_TS_SAMPLER_CLEAR_VALUE2(i0)		       (0x00001780 + 0x4*(i0))
+
+#define VIVS_TS_RT(i0)					       (0x00000000 + 0x4*(i0))
+#define VIVS_TS_RT__ESIZE					0x00000004
+#define VIVS_TS_RT__LEN						0x00000008
+
+#define VIVS_TS_RT_UNK017A0(i0)				       (0x000017a0 + 0x4*(i0))
+
+#define VIVS_TS_RT_STATUS_BASE(i0)			       (0x000017c0 + 0x4*(i0))
+
+#define VIVS_TS_RT_SURFACE_BASE(i0)			       (0x000017e0 + 0x4*(i0))
+
+#define VIVS_TS_RT_CLEAR_VALUE(i0)			       (0x00001a00 + 0x4*(i0))
+
+#define VIVS_TS_RT_CLEAR_VALUE2(i0)			       (0x00001a20 + 0x4*(i0))
+
+#define VIVS_TS_RT_UNK01A40(i0)				       (0x00001a40 + 0x4*(i0))
+
 #define VIVS_YUV						0x00000000
 
 #define VIVS_YUV_UNK01678					0x00001678
@@ -1101,7 +1211,7 @@ DEALINGS IN THE SOFTWARE.
 
 #define VIVS_NTE						0x00000000
 
-#define VIVS_NTE_SAMPLER(i0)				       (0x00010000 + 0x4*(i0))
+#define VIVS_NTE_SAMPLER(i0)				       (0x00000000 + 0x4*(i0))
 #define VIVS_NTE_SAMPLER__ESIZE					0x00000004
 #define VIVS_NTE_SAMPLER__LEN					0x00000020
 
@@ -1193,6 +1303,8 @@ DEALINGS IN THE SOFTWARE.
 
 #define VIVS_NTE_SAMPLER_UNK10480(i0)			       (0x00010480 + 0x4*(i0))
 
+#define VIVS_NTE_SAMPLER_UNK10500(i0)			       (0x00010500 + 0x4*(i0))
+
 #define VIVS_NTE_SAMPLER_ADDR(i0)			       (0x00010800 + 0x40*(i0))
 #define VIVS_NTE_SAMPLER_ADDR__ESIZE				0x00000040
 #define VIVS_NTE_SAMPLER_ADDR__LEN				0x00000020
@@ -1219,13 +1331,13 @@ DEALINGS IN THE SOFTWARE.
 #define VIVS_SH_INST_MEM__ESIZE					0x00000004
 #define VIVS_SH_INST_MEM__LEN					0x00001000
 
-#define VIVS_SH_UNK0C000_MIRROR(i0)			       (0x00008000 + 0x4*(i0))
-#define VIVS_SH_UNK0C000_MIRROR__ESIZE				0x00000004
-#define VIVS_SH_UNK0C000_MIRROR__LEN				0x00001000
+#define VIVS_SH_INST_MEM_MIRROR(i0)			       (0x00008000 + 0x4*(i0))
+#define VIVS_SH_INST_MEM_MIRROR__ESIZE				0x00000004
+#define VIVS_SH_INST_MEM_MIRROR__LEN				0x00001000
 
 #define VIVS_SH_UNIFORMS(i0)				       (0x00030000 + 0x4*(i0))
 #define VIVS_SH_UNIFORMS__ESIZE					0x00000004
-#define VIVS_SH_UNIFORMS__LEN					0x00000400
+#define VIVS_SH_UNIFORMS__LEN					0x00000800
 
 
 #endif /* STATE_3D_XML */