From 5aadea47fa2814c79d0d0b45dd95060fc44c1802 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 12 Jun 2024 12:59:27 +0200 Subject: [PATCH] etnaviv: update headers from rnndb Update to etna_viv commit a2ee3de27b38. This extends the VIVS_NFE_GENERIC_ATTRIB_CONFIG0_STREAM field to 4 bits, to fix vertex shaders with 9 or more ttribute streams. Signed-off-by: Philipp Zabel Reviewed-by: Christian Gmeiner Part-of: --- src/etnaviv/hw/cmdstream.xml.h | 6 ++-- src/etnaviv/hw/common.xml.h | 8 ++--- src/etnaviv/hw/common_3d.xml.h | 10 +++--- src/etnaviv/hw/state.xml.h | 61 ++++++++++++++++++++++++++------- src/etnaviv/hw/state_3d.xml.h | 18 +++++----- src/etnaviv/hw/state_blt.xml.h | 25 ++++++++------ src/etnaviv/hw/texdesc_3d.xml.h | 10 +++--- 7 files changed, 89 insertions(+), 49 deletions(-) diff --git a/src/etnaviv/hw/cmdstream.xml.h b/src/etnaviv/hw/cmdstream.xml.h index e4f824bad67..962e0cbae31 100644 --- a/src/etnaviv/hw/cmdstream.xml.h +++ b/src/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 ( 16933 bytes, from 2024-01-19 15:52:43) -- copyright.xml ( 1597 bytes, from 2022-05-20 05:37:53) -- common.xml ( 35664 bytes, from 2024-01-19 15:52:43) +- cmdstream.xml ( 16933 bytes, from 2024-04-10 11:43:40) +- copyright.xml ( 1597 bytes, from 2016-11-10 13:58:32) +- common.xml ( 35664 bytes, from 2024-04-10 11:43:40) Copyright (C) 2012-2024 by the following authors: - Wladimir J. van der Laan diff --git a/src/etnaviv/hw/common.xml.h b/src/etnaviv/hw/common.xml.h index 5f70cd9bc2b..fab4978145d 100644 --- a/src/etnaviv/hw/common.xml.h +++ b/src/etnaviv/hw/common.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 2022-05-20 05:37:53) -- copyright.xml ( 1597 bytes, from 2022-05-20 05:37:53) -- common.xml ( 35664 bytes, from 2024-01-19 15:52:43) -- common_3d.xml ( 15069 bytes, from 2024-01-19 15:52:43) +- texdesc_3d.xml ( 3183 bytes, from 2022-11-18 09:38:25) +- copyright.xml ( 1597 bytes, from 2016-11-10 13:58:32) +- common.xml ( 35664 bytes, from 2024-04-10 11:43:40) +- common_3d.xml ( 15069 bytes, from 2024-04-10 11:43:40) Copyright (C) 2012-2024 by the following authors: - Wladimir J. van der Laan diff --git a/src/etnaviv/hw/common_3d.xml.h b/src/etnaviv/hw/common_3d.xml.h index 60474a22479..61217379c9c 100644 --- a/src/etnaviv/hw/common_3d.xml.h +++ b/src/etnaviv/hw/common_3d.xml.h @@ -8,12 +8,12 @@ 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 2018-02-10 13:09:26) -- copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26) -- common.xml ( 35465 bytes, from 2023-11-13 11:29:31) -- common_3d.xml ( 15069 bytes, from 2023-11-13 11:29:31) +- texdesc_3d.xml ( 3183 bytes, from 2022-11-18 09:38:25) +- copyright.xml ( 1597 bytes, from 2016-11-10 13:58:32) +- common.xml ( 35664 bytes, from 2024-04-10 11:43:40) +- common_3d.xml ( 15069 bytes, from 2024-04-10 11:43:40) -Copyright (C) 2012-2023 by the following authors: +Copyright (C) 2012-2024 by the following authors: - Wladimir J. van der Laan - Christian Gmeiner - Lucas Stach diff --git a/src/etnaviv/hw/state.xml.h b/src/etnaviv/hw/state.xml.h index a360382b5a7..7847b7284bf 100644 --- a/src/etnaviv/hw/state.xml.h +++ b/src/etnaviv/hw/state.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 ( 29355 bytes, from 2024-01-19 15:52:43) -- common.xml ( 35664 bytes, from 2024-01-19 15:52:43) -- common_3d.xml ( 15069 bytes, from 2024-01-19 15:52:43) -- state_hi.xml ( 35854 bytes, from 2024-01-19 15:52:43) -- copyright.xml ( 1597 bytes, from 2022-05-20 05:37:53) -- state_2d.xml ( 52271 bytes, from 2024-01-19 15:52:43) -- state_3d.xml ( 89522 bytes, from 2024-01-19 15:52:43) -- state_blt.xml ( 14592 bytes, from 2024-01-19 15:52:43) -- state_vg.xml ( 5975 bytes, from 2022-05-20 05:37:53) +- state.xml ( 30526 bytes, from 2024-06-12 08:52:00) +- common.xml ( 35664 bytes, from 2024-04-10 11:43:40) +- common_3d.xml ( 15069 bytes, from 2024-04-10 11:43:40) +- state_hi.xml ( 35854 bytes, from 2024-04-10 11:43:40) +- copyright.xml ( 1597 bytes, from 2016-11-10 13:58:32) +- state_2d.xml ( 52271 bytes, from 2024-04-10 11:43:40) +- state_3d.xml ( 89522 bytes, from 2024-04-10 11:43:40) +- state_blt.xml ( 14592 bytes, from 2024-04-10 11:43:40) +- state_vg.xml ( 5975 bytes, from 2016-11-10 13:58:32) Copyright (C) 2012-2024 by the following authors: - Wladimir J. van der Laan @@ -49,6 +49,11 @@ DEALINGS IN THE SOFTWARE. #define VARYING_COMPONENT_USE_USED 0x00000001 #define VARYING_COMPONENT_USE_POINTCOORD_X 0x00000002 #define VARYING_COMPONENT_USE_POINTCOORD_Y 0x00000003 +#define VARYING_INTERPOLATION_MODE_SMOOTH 0x00000000 +#define VARYING_INTERPOLATION_MODE_NONPERSPECTIVE 0x00000001 +#define VARYING_INTERPOLATION_MODE_FLAT 0x00000002 +#define VARYING_INTERPOLATION_MODE_UNK 0x00000003 +#define VARYING_LOCATION_CENTROID 0x00000001 #define FE_DATA_TYPE_BYTE 0x00000000 #define FE_DATA_TYPE_UNSIGNED_BYTE 0x00000001 #define FE_DATA_TYPE_SHORT 0x00000002 @@ -64,6 +69,12 @@ DEALINGS IN THE SOFTWARE. #define FE_DATA_TYPE_UNSIGNED_INT_10_10_10_2 0x0000000d #define FE_DATA_TYPE_BYTE_I 0x0000000e #define FE_DATA_TYPE_SHORT_I 0x0000000f +#define VARYING_SEMANTIC_MODE__MASK 0x00000003 +#define VARYING_SEMANTIC_MODE__SHIFT 0 +#define VARYING_SEMANTIC_MODE(x) (((x) << VARYING_SEMANTIC_MODE__SHIFT) & VARYING_SEMANTIC_MODE__MASK) +#define VARYING_SEMANTIC_LOCATION__MASK 0x00000004 +#define VARYING_SEMANTIC_LOCATION__SHIFT 2 +#define VARYING_SEMANTIC_LOCATION(x) (((x) << VARYING_SEMANTIC_LOCATION__SHIFT) & VARYING_SEMANTIC_LOCATION__MASK) #define FE_VERTEX_STREAM_CONTROL_VERTEX_STRIDE__MASK 0x000000ff #define FE_VERTEX_STREAM_CONTROL_VERTEX_STRIDE__SHIFT 0 #define FE_VERTEX_STREAM_CONTROL_VERTEX_STRIDE(x) (((x) << FE_VERTEX_STREAM_CONTROL_VERTEX_STRIDE__SHIFT) & FE_VERTEX_STREAM_CONTROL_VERTEX_STRIDE__MASK) @@ -438,9 +449,33 @@ DEALINGS IN THE SOFTWARE. #define VIVS_GL_GS_UNK038A0__ESIZE 0x00000004 #define VIVS_GL_GS_UNK038A0__LEN 0x00000008 -#define VIVS_GL_HALTI5_UNK038C0(i0) (0x000038c0 + 0x4*(i0)) -#define VIVS_GL_HALTI5_UNK038C0__ESIZE 0x00000004 -#define VIVS_GL_HALTI5_UNK038C0__LEN 0x00000010 +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES(i0) (0x000038c0 + 0x4*(i0)) +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES__ESIZE 0x00000004 +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES__LEN 0x00000010 +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V0_X__MASK 0x00000007 +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V0_X__SHIFT 0 +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V0_X(x) (((x) << VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V0_X__SHIFT) & VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V0_X__MASK) +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V0_Y__MASK 0x00000070 +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V0_Y__SHIFT 4 +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V0_Y(x) (((x) << VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V0_Y__SHIFT) & VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V0_Y__MASK) +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V0_Z__MASK 0x00000700 +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V0_Z__SHIFT 8 +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V0_Z(x) (((x) << VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V0_Z__SHIFT) & VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V0_Z__MASK) +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V0_W__MASK 0x00007000 +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V0_W__SHIFT 12 +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V0_W(x) (((x) << VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V0_W__SHIFT) & VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V0_W__MASK) +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V1_X__MASK 0x00070000 +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V1_X__SHIFT 16 +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V1_X(x) (((x) << VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V1_X__SHIFT) & VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V1_X__MASK) +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V1_Y__MASK 0x00700000 +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V1_Y__SHIFT 20 +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V1_Y(x) (((x) << VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V1_Y__SHIFT) & VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V1_Y__MASK) +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V1_Z__MASK 0x07000000 +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V1_Z__SHIFT 24 +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V1_Z(x) (((x) << VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V1_Z__SHIFT) & VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V1_Z__MASK) +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V1_W__MASK 0x70000000 +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V1_W__SHIFT 28 +#define VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V1_W(x) (((x) << VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V1_W__SHIFT) & VIVS_GL_HALTI5_SHADER_ATTRIBUTES_V1_W__MASK) #define VIVS_GL_SECURITY_UNK3900 0x00003900 @@ -532,7 +567,7 @@ DEALINGS IN THE SOFTWARE. #define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_ENDIAN__MASK 0x00000030 #define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_ENDIAN__SHIFT 4 #define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_ENDIAN(x) (((x) << VIVS_NFE_GENERIC_ATTRIB_CONFIG0_ENDIAN__SHIFT) & VIVS_NFE_GENERIC_ATTRIB_CONFIG0_ENDIAN__MASK) -#define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_STREAM__MASK 0x00000700 +#define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_STREAM__MASK 0x00000f00 #define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_STREAM__SHIFT 8 #define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_STREAM(x) (((x) << VIVS_NFE_GENERIC_ATTRIB_CONFIG0_STREAM__SHIFT) & VIVS_NFE_GENERIC_ATTRIB_CONFIG0_STREAM__MASK) #define VIVS_NFE_GENERIC_ATTRIB_CONFIG0_NUM__MASK 0x00003000 diff --git a/src/etnaviv/hw/state_3d.xml.h b/src/etnaviv/hw/state_3d.xml.h index 6fc8949e1a5..154caf0ab88 100644 --- a/src/etnaviv/hw/state_3d.xml.h +++ b/src/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 ( 29355 bytes, from 2024-01-19 15:52:43) -- common.xml ( 35664 bytes, from 2024-01-19 15:52:43) -- common_3d.xml ( 15069 bytes, from 2024-01-19 15:52:43) -- state_hi.xml ( 35854 bytes, from 2024-01-19 15:52:43) -- copyright.xml ( 1597 bytes, from 2022-05-20 05:37:53) -- state_2d.xml ( 52271 bytes, from 2024-01-19 15:52:43) -- state_3d.xml ( 89522 bytes, from 2024-01-19 15:52:43) -- state_blt.xml ( 14592 bytes, from 2024-01-19 15:52:43) -- state_vg.xml ( 5975 bytes, from 2022-05-20 05:37:53) +- state.xml ( 30526 bytes, from 2024-06-12 08:52:00) +- common.xml ( 35664 bytes, from 2024-04-10 11:43:40) +- common_3d.xml ( 15069 bytes, from 2024-04-10 11:43:40) +- state_hi.xml ( 35854 bytes, from 2024-04-10 11:43:40) +- copyright.xml ( 1597 bytes, from 2016-11-10 13:58:32) +- state_2d.xml ( 52271 bytes, from 2024-04-10 11:43:40) +- state_3d.xml ( 89522 bytes, from 2024-04-10 11:43:40) +- state_blt.xml ( 14592 bytes, from 2024-04-10 11:43:40) +- state_vg.xml ( 5975 bytes, from 2016-11-10 13:58:32) Copyright (C) 2012-2024 by the following authors: - Wladimir J. van der Laan diff --git a/src/etnaviv/hw/state_blt.xml.h b/src/etnaviv/hw/state_blt.xml.h index 06c2ae3a332..2f03c0bfe90 100644 --- a/src/etnaviv/hw/state_blt.xml.h +++ b/src/etnaviv/hw/state_blt.xml.h @@ -8,17 +8,17 @@ 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 ( 28218 bytes, from 2023-11-13 11:29:31) -- common.xml ( 35465 bytes, from 2023-11-13 11:29:31) -- common_3d.xml ( 15069 bytes, from 2023-11-13 11:29:31) -- state_hi.xml ( 34935 bytes, from 2023-11-13 11:29:31) -- copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26) -- state_2d.xml ( 52271 bytes, from 2023-09-13 13:37:23) -- state_3d.xml ( 86123 bytes, from 2023-11-13 12:42:26) -- state_blt.xml ( 14424 bytes, from 2023-09-13 13:37:23) -- state_vg.xml ( 5975 bytes, from 2018-02-10 13:09:26) +- state.xml ( 30526 bytes, from 2024-06-12 08:52:00) +- common.xml ( 35664 bytes, from 2024-04-10 11:43:40) +- common_3d.xml ( 15069 bytes, from 2024-04-10 11:43:40) +- state_hi.xml ( 35854 bytes, from 2024-04-10 11:43:40) +- copyright.xml ( 1597 bytes, from 2016-11-10 13:58:32) +- state_2d.xml ( 52271 bytes, from 2024-04-10 11:43:40) +- state_3d.xml ( 89522 bytes, from 2024-04-10 11:43:40) +- state_blt.xml ( 14592 bytes, from 2024-04-10 11:43:40) +- state_vg.xml ( 5975 bytes, from 2016-11-10 13:58:32) -Copyright (C) 2012-2023 by the following authors: +Copyright (C) 2012-2024 by the following authors: - Wladimir J. van der Laan - Christian Gmeiner - Lucas Stach @@ -299,6 +299,11 @@ DEALINGS IN THE SOFTWARE. #define VIVS_BLT_MIP_STRIDE(i0) (0x00014300 + 0x4*(i0)) +#define VIVS_BLT_MULTI_CLUSTER_UNK14338 0x00014338 +#define VIVS_BLT_MULTI_CLUSTER_UNK14338_SELECTED_CLUSTER__MASK 0x000000ff +#define VIVS_BLT_MULTI_CLUSTER_UNK14338_SELECTED_CLUSTER__SHIFT 0 +#define VIVS_BLT_MULTI_CLUSTER_UNK14338_SELECTED_CLUSTER(x) (((x) << VIVS_BLT_MULTI_CLUSTER_UNK14338_SELECTED_CLUSTER__SHIFT) & VIVS_BLT_MULTI_CLUSTER_UNK14338_SELECTED_CLUSTER__MASK) + #define VIVS_BLT_SRC_END 0x000140f4 #define VIVS_BLT_DEST_END 0x00014334 diff --git a/src/etnaviv/hw/texdesc_3d.xml.h b/src/etnaviv/hw/texdesc_3d.xml.h index 15af0af1540..3abfe23b364 100644 --- a/src/etnaviv/hw/texdesc_3d.xml.h +++ b/src/etnaviv/hw/texdesc_3d.xml.h @@ -8,12 +8,12 @@ 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 2018-02-10 13:09:26) -- copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26) -- common.xml ( 35465 bytes, from 2023-11-13 11:29:31) -- common_3d.xml ( 15069 bytes, from 2023-11-13 11:29:31) +- texdesc_3d.xml ( 3183 bytes, from 2022-11-18 09:38:25) +- copyright.xml ( 1597 bytes, from 2016-11-10 13:58:32) +- common.xml ( 35664 bytes, from 2024-04-10 11:43:40) +- common_3d.xml ( 15069 bytes, from 2024-04-10 11:43:40) -Copyright (C) 2012-2018 by the following authors: +Copyright (C) 2012-2022 by the following authors: - Wladimir J. van der Laan - Christian Gmeiner - Lucas Stach