summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/gallium/drivers/etnaviv/hw/common_3d.xml.h16
-rw-r--r--src/gallium/drivers/etnaviv/hw/state_3d.xml.h39
-rw-r--r--src/gallium/drivers/etnaviv/hw/texdesc_3d.xml.h16
3 files changed, 40 insertions, 31 deletions
diff --git a/src/gallium/drivers/etnaviv/hw/common_3d.xml.h b/src/gallium/drivers/etnaviv/hw/common_3d.xml.h
index 39e8bd69d24..8308bffa932 100644
--- a/src/gallium/drivers/etnaviv/hw/common_3d.xml.h
+++ b/src/gallium/drivers/etnaviv/hw/common_3d.xml.h
@@ -8,10 +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:
-- texdesc_3d.xml ( 3183 bytes, from 2019-01-07 09:52:31)
-- copyright.xml ( 1597 bytes, from 2019-01-07 09:52:31)
-- common.xml ( 35468 bytes, from 2019-01-07 09:52:31)
-- common_3d.xml ( 14322 bytes, from 2019-08-19 14:35:07)
+- texdesc_3d.xml ( 3183 bytes, from 2019-08-09 17:33:50)
+- copyright.xml ( 1597 bytes, from 2019-08-09 17:34:08)
+- common.xml ( 35468 bytes, from 2019-08-09 17:16:20)
+- common_3d.xml ( 14991 bytes, from 2019-09-12 20:32:47)
Copyright (C) 2012-2019 by the following authors:
- Wladimir J. van der Laan <[email protected]>
@@ -129,6 +129,14 @@ DEALINGS IN THE SOFTWARE.
#define TS_MODE_256B 0x00000001
#define TEXTURE_ADDRESSING_MODE_TILED 0x00000000
#define TEXTURE_ADDRESSING_MODE_LINEAR 0x00000003
+#define TEXTURE_COMPARE_FUNC_LEQUAL 0x00000000
+#define TEXTURE_COMPARE_FUNC_GEQUAL 0x00000001
+#define TEXTURE_COMPARE_FUNC_LESS 0x00000002
+#define TEXTURE_COMPARE_FUNC_GREATER 0x00000003
+#define TEXTURE_COMPARE_FUNC_EQUAL 0x00000004
+#define TEXTURE_COMPARE_FUNC_NOTEQUAL 0x00000005
+#define TEXTURE_COMPARE_FUNC_ALWAYS 0x00000006
+#define TEXTURE_COMPARE_FUNC_NEVER 0x00000007
#define COMPRESSION_FORMAT_A4R4G4B4 0x00000000
#define COMPRESSION_FORMAT_A1R5G5B5 0x00000001
#define COMPRESSION_FORMAT_R5G6B5 0x00000002
diff --git a/src/gallium/drivers/etnaviv/hw/state_3d.xml.h b/src/gallium/drivers/etnaviv/hw/state_3d.xml.h
index 222a3aa54a6..197b6a2f7b7 100644
--- a/src/gallium/drivers/etnaviv/hw/state_3d.xml.h
+++ b/src/gallium/drivers/etnaviv/hw/state_3d.xml.h
@@ -8,15 +8,15 @@ 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 ( 26666 bytes, from 2019-08-19 14:35:07)
-- common.xml ( 35468 bytes, from 2019-01-07 09:52:31)
-- common_3d.xml ( 14322 bytes, from 2019-08-19 14:35:07)
-- state_hi.xml ( 30232 bytes, from 2019-01-07 09:52:31)
-- copyright.xml ( 1597 bytes, from 2019-01-07 09:52:31)
-- state_2d.xml ( 51552 bytes, from 2019-01-07 09:52:31)
-- state_3d.xml ( 83505 bytes, from 2019-08-19 14:46:17)
-- state_blt.xml ( 14252 bytes, from 2019-08-19 14:35:07)
-- state_vg.xml ( 5975 bytes, from 2019-01-07 09:52:31)
+- state.xml ( 26666 bytes, from 2019-08-12 13:32:55)
+- common.xml ( 35468 bytes, from 2019-08-09 17:16:20)
+- common_3d.xml ( 14991 bytes, from 2019-09-12 20:32:47)
+- state_hi.xml ( 30396 bytes, from 2019-09-12 20:21:39)
+- copyright.xml ( 1597 bytes, from 2019-08-09 17:34:08)
+- state_2d.xml ( 51552 bytes, from 2019-08-09 17:34:00)
+- state_3d.xml ( 83069 bytes, from 2019-09-12 20:28:49)
+- state_blt.xml ( 14252 bytes, from 2019-09-12 20:21:39)
+- state_vg.xml ( 5975 bytes, from 2019-08-09 17:33:52)
Copyright (C) 2012-2019 by the following authors:
- Wladimir J. van der Laan <[email protected]>
@@ -1476,7 +1476,7 @@ DEALINGS IN THE SOFTWARE.
#define VIVS_TE_SAMPLER_LOG_SIZE_HEIGHT__SHIFT 10
#define VIVS_TE_SAMPLER_LOG_SIZE_HEIGHT(x) (((x) << VIVS_TE_SAMPLER_LOG_SIZE_HEIGHT__SHIFT) & VIVS_TE_SAMPLER_LOG_SIZE_HEIGHT__MASK)
#define VIVS_TE_SAMPLER_LOG_SIZE_ASTC 0x10000000
-#define VIVS_TE_SAMPLER_LOG_SIZE_RGB 0x20000000
+#define VIVS_TE_SAMPLER_LOG_SIZE_INT_FILTER 0x20000000
#define VIVS_TE_SAMPLER_LOG_SIZE_SRGB 0x80000000
#define VIVS_TE_SAMPLER_LOD_CONFIG(i0) (0x000020c0 + 0x4*(i0))
@@ -1599,7 +1599,7 @@ DEALINGS IN THE SOFTWARE.
#define VIVS_NTE_SAMPLER_LOG_SIZE_HEIGHT__SHIFT 10
#define VIVS_NTE_SAMPLER_LOG_SIZE_HEIGHT(x) (((x) << VIVS_NTE_SAMPLER_LOG_SIZE_HEIGHT__SHIFT) & VIVS_NTE_SAMPLER_LOG_SIZE_HEIGHT__MASK)
#define VIVS_NTE_SAMPLER_LOG_SIZE_ASTC 0x10000000
-#define VIVS_NTE_SAMPLER_LOG_SIZE_RGB 0x20000000
+#define VIVS_NTE_SAMPLER_LOG_SIZE_INT_FILTER 0x20000000
#define VIVS_NTE_SAMPLER_LOG_SIZE_SRGB 0x80000000
#define VIVS_NTE_SAMPLER_LOD_CONFIG(i0) (0x00010180 + 0x4*(i0))
@@ -1681,13 +1681,17 @@ DEALINGS IN THE SOFTWARE.
#define VIVS_NTE_SAMPLER_ASTC3(i0) (0x00010600 + 0x4*(i0))
#define VIVS_NTE_SAMPLER_BASELOD(i0) (0x00010700 + 0x4*(i0))
-#define VIVS_NTE_SAMPLER_BASELOD_UNK23 0x00800000
#define VIVS_NTE_SAMPLER_BASELOD_BASELOD__MASK 0x0000000f
#define VIVS_NTE_SAMPLER_BASELOD_BASELOD__SHIFT 0
#define VIVS_NTE_SAMPLER_BASELOD_BASELOD(x) (((x) << VIVS_NTE_SAMPLER_BASELOD_BASELOD__SHIFT) & VIVS_NTE_SAMPLER_BASELOD_BASELOD__MASK)
#define VIVS_NTE_SAMPLER_BASELOD_MAXLOD__MASK 0x00000f00
#define VIVS_NTE_SAMPLER_BASELOD_MAXLOD__SHIFT 8
#define VIVS_NTE_SAMPLER_BASELOD_MAXLOD(x) (((x) << VIVS_NTE_SAMPLER_BASELOD_MAXLOD__SHIFT) & VIVS_NTE_SAMPLER_BASELOD_MAXLOD__MASK)
+#define VIVS_NTE_SAMPLER_BASELOD_COMPARE_ENABLE 0x00010000
+#define VIVS_NTE_SAMPLER_BASELOD_COMPARE_FUNC__MASK 0x00700000
+#define VIVS_NTE_SAMPLER_BASELOD_COMPARE_FUNC__SHIFT 20
+#define VIVS_NTE_SAMPLER_BASELOD_COMPARE_FUNC(x) (((x) << VIVS_NTE_SAMPLER_BASELOD_COMPARE_FUNC__SHIFT) & VIVS_NTE_SAMPLER_BASELOD_COMPARE_FUNC__MASK)
+#define VIVS_NTE_SAMPLER_BASELOD_BASELOD_ENABLE 0x00800000
#define VIVS_NTE_SAMPLER_UNK10780(i0) (0x00010780 + 0x4*(i0))
@@ -1790,17 +1794,10 @@ DEALINGS IN THE SOFTWARE.
#define VIVS_NTE_DESCRIPTOR_SAMP_CTRL0_COMPARE_ENABLE 0x00020000
#define VIVS_NTE_DESCRIPTOR_SAMP_CTRL0_COMPARE_FUNC__MASK 0x001c0000
#define VIVS_NTE_DESCRIPTOR_SAMP_CTRL0_COMPARE_FUNC__SHIFT 18
-#define VIVS_NTE_DESCRIPTOR_SAMP_CTRL0_COMPARE_FUNC_LE 0x00000000
-#define VIVS_NTE_DESCRIPTOR_SAMP_CTRL0_COMPARE_FUNC_GE 0x00040000
-#define VIVS_NTE_DESCRIPTOR_SAMP_CTRL0_COMPARE_FUNC_LT 0x00080000
-#define VIVS_NTE_DESCRIPTOR_SAMP_CTRL0_COMPARE_FUNC_GT 0x000c0000
-#define VIVS_NTE_DESCRIPTOR_SAMP_CTRL0_COMPARE_FUNC_EQ 0x00100000
-#define VIVS_NTE_DESCRIPTOR_SAMP_CTRL0_COMPARE_FUNC_NE 0x00140000
-#define VIVS_NTE_DESCRIPTOR_SAMP_CTRL0_COMPARE_FUNC_ALWAYS 0x00180000
-#define VIVS_NTE_DESCRIPTOR_SAMP_CTRL0_COMPARE_FUNC_NEVER 0x001c0000
+#define VIVS_NTE_DESCRIPTOR_SAMP_CTRL0_COMPARE_FUNC(x) (((x) << VIVS_NTE_DESCRIPTOR_SAMP_CTRL0_COMPARE_FUNC__SHIFT) & VIVS_NTE_DESCRIPTOR_SAMP_CTRL0_COMPARE_FUNC__MASK)
#define VIVS_NTE_DESCRIPTOR_SAMP_CTRL0_UNK21 0x00200000
#define VIVS_NTE_DESCRIPTOR_SAMP_CTRL0_UNK22 0x00400000
-#define VIVS_NTE_DESCRIPTOR_SAMP_CTRL0_RGB 0x00800000
+#define VIVS_NTE_DESCRIPTOR_SAMP_CTRL0_INT_FILTER 0x00800000
#define VIVS_NTE_DESCRIPTOR_SAMP_CTRL1(i0) (0x00016e00 + 0x4*(i0))
#define VIVS_NTE_DESCRIPTOR_SAMP_CTRL1_UNK1 0x00000002
diff --git a/src/gallium/drivers/etnaviv/hw/texdesc_3d.xml.h b/src/gallium/drivers/etnaviv/hw/texdesc_3d.xml.h
index a498762bf2d..0226c2e3c10 100644
--- a/src/gallium/drivers/etnaviv/hw/texdesc_3d.xml.h
+++ b/src/gallium/drivers/etnaviv/hw/texdesc_3d.xml.h
@@ -8,10 +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:
-- texdesc_3d.xml ( 3183 bytes, from 2019-01-07 09:52:31)
-- copyright.xml ( 1597 bytes, from 2019-01-07 09:52:31)
-- common.xml ( 35468 bytes, from 2019-01-07 09:52:31)
-- common_3d.xml ( 14322 bytes, from 2019-08-19 14:35:07)
+- texdesc_3d.xml ( 3183 bytes, from 2019-08-09 17:33:50)
+- copyright.xml ( 1597 bytes, from 2019-08-09 17:34:08)
+- common.xml ( 35468 bytes, from 2019-08-09 17:16:20)
+- common_3d.xml ( 14991 bytes, from 2019-09-12 20:32:47)
Copyright (C) 2012-2019 by the following authors:
- Wladimir J. van der Laan <[email protected]>
@@ -139,13 +139,17 @@ DEALINGS IN THE SOFTWARE.
#define TEXDESC_ASTC3 0x00000064
#define TEXDESC_BASELOD 0x00000068
-#define TEXDESC_BASELOD_UNK23 0x00800000
#define TEXDESC_BASELOD_BASELOD__MASK 0x0000000f
#define TEXDESC_BASELOD_BASELOD__SHIFT 0
#define TEXDESC_BASELOD_BASELOD(x) (((x) << TEXDESC_BASELOD_BASELOD__SHIFT) & TEXDESC_BASELOD_BASELOD__MASK)
#define TEXDESC_BASELOD_MAXLOD__MASK 0x00000f00
#define TEXDESC_BASELOD_MAXLOD__SHIFT 8
#define TEXDESC_BASELOD_MAXLOD(x) (((x) << TEXDESC_BASELOD_MAXLOD__SHIFT) & TEXDESC_BASELOD_MAXLOD__MASK)
+#define TEXDESC_BASELOD_COMPARE_ENABLE 0x00010000
+#define TEXDESC_BASELOD_COMPARE_FUNC__MASK 0x00700000
+#define TEXDESC_BASELOD_COMPARE_FUNC__SHIFT 20
+#define TEXDESC_BASELOD_COMPARE_FUNC(x) (((x) << TEXDESC_BASELOD_COMPARE_FUNC__SHIFT) & TEXDESC_BASELOD_COMPARE_FUNC__MASK)
+#define TEXDESC_BASELOD_BASELOD_ENABLE 0x00800000
#define TEXDESC_CONFIG2 0x0000006c
@@ -184,7 +188,7 @@ DEALINGS IN THE SOFTWARE.
#define TEXDESC_LOG_SIZE_HEIGHT__SHIFT 10
#define TEXDESC_LOG_SIZE_HEIGHT(x) (((x) << TEXDESC_LOG_SIZE_HEIGHT__SHIFT) & TEXDESC_LOG_SIZE_HEIGHT__MASK)
#define TEXDESC_LOG_SIZE_ASTC 0x10000000
-#define TEXDESC_LOG_SIZE_RGB 0x20000000
+#define TEXDESC_LOG_SIZE_INT_FILTER 0x20000000
#define TEXDESC_LOG_SIZE_SRGB 0x80000000
#define TEXDESC_BORDER_COLOR_R 0x0000008c
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 01:08:11 +0000