From cca43e76e1f76e65903d85b02de44818d3194d25 Mon Sep 17 00:00:00 2001 From: Lucas Stach Date: Mon, 6 Jan 2025 21:51:11 +0100 Subject: [PATCH] etnaviv: Update headers from rnndb Update to rnndb commit 1b944df41e12. Signed-off-by: Lucas Stach Reviewed-by: Christian Gmeiner Part-of: --- src/etnaviv/hw/state.xml.h | 24 +++++++++---------- .../drivers/etnaviv/etnaviv_compiler_nir.c | 8 +++---- src/gallium/drivers/etnaviv/etnaviv_context.c | 4 ++-- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/etnaviv/hw/state.xml.h b/src/etnaviv/hw/state.xml.h index aef37aae50f..0ab910ea24b 100644 --- a/src/etnaviv/hw/state.xml.h +++ b/src/etnaviv/hw/state.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 ( 30526 bytes, from 2024-10-10 18:45:02) -- common.xml ( 35664 bytes, from 2023-12-13 09:33:18) -- common_3d.xml ( 15069 bytes, from 2023-12-13 09:33:18) -- state_hi.xml ( 35909 bytes, from 2024-06-21 11:31:54) +- state.xml ( 30672 bytes, from 2025-01-06 20:30:33) +- common.xml ( 35664 bytes, from 2024-12-05 12:09:36) +- common_3d.xml ( 15069 bytes, from 2024-12-05 12:09:36) +- state_hi.xml ( 35909 bytes, from 2024-12-05 12:09:36) - copyright.xml ( 1597 bytes, from 2020-10-28 12:56:03) - state_2d.xml ( 52271 bytes, from 2023-05-30 20:50:02) -- state_3d.xml ( 89542 bytes, from 2024-10-10 18:45:02) -- state_blt.xml ( 14592 bytes, from 2023-12-13 09:33:18) +- state_3d.xml ( 89504 bytes, from 2024-12-16 16:15:15) +- state_blt.xml ( 14592 bytes, from 2024-12-05 12:09:36) - state_vg.xml ( 5975 bytes, from 2020-10-28 12:56:03) -Copyright (C) 2012-2024 by the following authors: +Copyright (C) 2012-2025 by the following authors: - Wladimir J. van der Laan - Christian Gmeiner - Lucas Stach @@ -45,8 +45,8 @@ DEALINGS IN THE SOFTWARE. */ -#define VARYING_COMPONENT_USE_UNUSED 0x00000000 -#define VARYING_COMPONENT_USE_USED 0x00000001 +#define VARYING_COMPONENT_USE_GENERIC 0x00000000 +#define VARYING_COMPONENT_USE_COLOR 0x00000001 #define VARYING_COMPONENT_USE_POINTCOORD_X 0x00000002 #define VARYING_COMPONENT_USE_POINTCOORD_Y 0x00000003 #define VARYING_INTERPOLATION_MODE_SMOOTH 0x00000000 @@ -391,13 +391,11 @@ DEALINGS IN THE SOFTWARE. #define VIVS_GL_VARYING_COMPONENT_USE_COMP15__SHIFT 30 #define VIVS_GL_VARYING_COMPONENT_USE_COMP15(x) (((x) << VIVS_GL_VARYING_COMPONENT_USE_COMP15__SHIFT) & VIVS_GL_VARYING_COMPONENT_USE_COMP15__MASK) -#define VIVS_GL_UNK0382C 0x0000382c - #define VIVS_GL_OCCLUSION_QUERY_CONTROL 0x00003830 #define VIVS_GL_VARYING_NUM_COMPONENTS2 0x00003834 -#define VIVS_GL_UNK03838 0x00003838 +#define VIVS_GL_VARYING_COMPONENT_USE2 0x00003838 #define VIVS_GL_API_MODE 0x0000384c #define VIVS_GL_API_MODE_OPENGL 0x00000000 @@ -406,7 +404,7 @@ DEALINGS IN THE SOFTWARE. #define VIVS_GL_CONTEXT_POINTER 0x00003850 -#define VIVS_GL_UNK03854 0x00003854 +#define VIVS_GL_VARYING_COMPONENT_USE3 0x00003854 #define VIVS_GL_BUG_FIXES 0x00003860 diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c index 989c6efc56a..7a45c79fccc 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c +++ b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c @@ -1397,10 +1397,10 @@ etna_link_shader(struct etna_shader_link_info *info, else /* texture coord or other bypasses flat shading */ varying->pa_attributes = 0x2f1; - varying->use[0] = VARYING_COMPONENT_USE_UNUSED; - varying->use[1] = VARYING_COMPONENT_USE_UNUSED; - varying->use[2] = VARYING_COMPONENT_USE_UNUSED; - varying->use[3] = VARYING_COMPONENT_USE_UNUSED; + varying->use[0] = VARYING_COMPONENT_USE_GENERIC; + varying->use[1] = VARYING_COMPONENT_USE_GENERIC; + varying->use[2] = VARYING_COMPONENT_USE_GENERIC; + varying->use[3] = VARYING_COMPONENT_USE_GENERIC; /* point/tex coord is an input to the PS without matching VS output, * so it gets a varying slot without being assigned a VS register. diff --git a/src/gallium/drivers/etnaviv/etnaviv_context.c b/src/gallium/drivers/etnaviv/etnaviv_context.c index 0850d1c051c..b44e9925f0d 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_context.c +++ b/src/gallium/drivers/etnaviv/etnaviv_context.c @@ -500,8 +500,8 @@ etna_reset_gpu_state(struct etna_context *ctx) etna_set_state(stream, VIVS_VS_SAMPLER_BASE, 0x00000020); etna_set_state(stream, VIVS_SH_CONFIG, VIVS_SH_CONFIG_RTNE_ROUNDING); } else { /* Only on pre-HALTI5 */ - etna_set_state(stream, VIVS_GL_UNK03838, 0x00000000); - etna_set_state(stream, VIVS_GL_UNK03854, 0x00000000); + etna_set_state(stream, VIVS_GL_VARYING_COMPONENT_USE2, 0x00000000); + etna_set_state(stream, VIVS_GL_VARYING_COMPONENT_USE3, 0x00000000); } if (VIV_FEATURE(screen, ETNA_FEATURE_BUG_FIXES18))