OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

etnaviv: Update headers from rnndb

Browse Source 
Update to rnndb commit 1b944df41e12.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Christian Gmeiner <cgmeiner@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32922>
This commit is contained in:
Lucas Stach
2025-01-06 21:51:11 +01:00
committed by Marge Bot
parent d2f52e61c2
commit cca43e76e1
3 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/etnaviv/hw/state.xml.h
View File

@@ -8,17 +8,17 @@ http://0x04.net/cgit/index.cgi/rules-ng-ng
git clone git://0x04.net/rules-ng-ng git clone git://0x04.net/rules-ng-ng
The rules-ng-ng source files this header was generated from are: The rules-ng-ng source files this header was generated from are:
- state.xml ( 30526 bytes, from 2024-10-10 18:45:02) - state.xml ( 30672 bytes, from 2025-01-06 20:30:33)
- common.xml ( 35664 bytes, from 2023-12-13 09:33:18) - common.xml ( 35664 bytes, from 2024-12-05 12:09:36)
- common_3d.xml ( 15069 bytes, from 2023-12-13 09:33:18) - common_3d.xml ( 15069 bytes, from 2024-12-05 12:09:36)
- state_hi.xml ( 35909 bytes, from 2024-06-21 11:31:54) - state_hi.xml ( 35909 bytes, from 2024-12-05 12:09:36)
- copyright.xml ( 1597 bytes, from 2020-10-28 12:56:03) - copyright.xml ( 1597 bytes, from 2020-10-28 12:56:03)
- state_2d.xml ( 52271 bytes, from 2023-05-30 20:50:02) - 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_3d.xml ( 89504 bytes, from 2024-12-16 16:15:15)
- state_blt.xml ( 14592 bytes, from 2023-12-13 09:33:18) - state_blt.xml ( 14592 bytes, from 2024-12-05 12:09:36)
- state_vg.xml ( 5975 bytes, from 2020-10-28 12:56:03) - 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 <laanwj@gmail.com> - Wladimir J. van der Laan <laanwj@gmail.com>
- Christian Gmeiner <christian.gmeiner@gmail.com> - Christian Gmeiner <christian.gmeiner@gmail.com>
- Lucas Stach <l.stach@pengutronix.de> - Lucas Stach <l.stach@pengutronix.de>
@@ -45,8 +45,8 @@ DEALINGS IN THE SOFTWARE.
*/ */
#define VARYING_COMPONENT_USE_UNUSED 0x00000000 #define VARYING_COMPONENT_USE_GENERIC 0x00000000
#define VARYING_COMPONENT_USE_USED 0x00000001 #define VARYING_COMPONENT_USE_COLOR 0x00000001
#define VARYING_COMPONENT_USE_POINTCOORD_X 0x00000002 #define VARYING_COMPONENT_USE_POINTCOORD_X 0x00000002
#define VARYING_COMPONENT_USE_POINTCOORD_Y 0x00000003 #define VARYING_COMPONENT_USE_POINTCOORD_Y 0x00000003
#define VARYING_INTERPOLATION_MODE_SMOOTH 0x00000000 #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__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_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_OCCLUSION_QUERY_CONTROL 0x00003830
#define VIVS_GL_VARYING_NUM_COMPONENTS2 0x00003834 #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 0x0000384c
#define VIVS_GL_API_MODE_OPENGL 0x00000000 #define VIVS_GL_API_MODE_OPENGL 0x00000000
@@ -406,7 +404,7 @@ DEALINGS IN THE SOFTWARE.
#define VIVS_GL_CONTEXT_POINTER 0x00003850 #define VIVS_GL_CONTEXT_POINTER 0x00003850
#define VIVS_GL_UNK03854 0x00003854 #define VIVS_GL_VARYING_COMPONENT_USE3 0x00003854
#define VIVS_GL_BUG_FIXES 0x00003860 #define VIVS_GL_BUG_FIXES 0x00003860

8
src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c
View File

@@ -1397,10 +1397,10 @@ etna_link_shader(struct etna_shader_link_info *info,
else /* texture coord or other bypasses flat shading */ else /* texture coord or other bypasses flat shading */
varying->pa_attributes = 0x2f1; varying->pa_attributes = 0x2f1;
varying->use[0] = VARYING_COMPONENT_USE_UNUSED; varying->use[0] = VARYING_COMPONENT_USE_GENERIC;
varying->use[1] = VARYING_COMPONENT_USE_UNUSED; varying->use[1] = VARYING_COMPONENT_USE_GENERIC;
varying->use[2] = VARYING_COMPONENT_USE_UNUSED; varying->use[2] = VARYING_COMPONENT_USE_GENERIC;
varying->use[3] = VARYING_COMPONENT_USE_UNUSED; varying->use[3] = VARYING_COMPONENT_USE_GENERIC;
/* point/tex coord is an input to the PS without matching VS output, /* 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. * so it gets a varying slot without being assigned a VS register.

4
src/gallium/drivers/etnaviv/etnaviv_context.c
View File

@@ -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_VS_SAMPLER_BASE, 0x00000020);
etna_set_state(stream, VIVS_SH_CONFIG, VIVS_SH_CONFIG_RTNE_ROUNDING); etna_set_state(stream, VIVS_SH_CONFIG, VIVS_SH_CONFIG_RTNE_ROUNDING);
} else { /* Only on pre-HALTI5 */ } else { /* Only on pre-HALTI5 */
etna_set_state(stream, VIVS_GL_UNK03838, 0x00000000); etna_set_state(stream, VIVS_GL_VARYING_COMPONENT_USE2, 0x00000000);
etna_set_state(stream, VIVS_GL_UNK03854, 0x00000000); etna_set_state(stream, VIVS_GL_VARYING_COMPONENT_USE3, 0x00000000);
} }
if (VIV_FEATURE(screen, ETNA_FEATURE_BUG_FIXES18)) if (VIV_FEATURE(screen, ETNA_FEATURE_BUG_FIXES18))