From 5505bb6c6d2b7de2a50bc3311e84ed9781128d7e Mon Sep 17 00:00:00 2001 From: "Juan A. Suarez Romero" Date: Fri, 23 May 2025 10:59:37 +0200 Subject: [PATCH] v3d/compiler: don't use deprecated NIR_PASS_V macro We still keep it for the case of nir_scheduling, as this pass requires to be adapted to return the progress as well as update the metadata. Check more details at https://gitlab.freedesktop.org/mesa/mesa/-/issues/10409. Signed-off-by: Juan A. Suarez Romero Reviewed-by: Christian Gmeiner Part-of: --- src/broadcom/compiler/vir.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/broadcom/compiler/vir.c b/src/broadcom/compiler/vir.c index 8dc50164adc..3eb421c02c9 100644 --- a/src/broadcom/compiler/vir.c +++ b/src/broadcom/compiler/vir.c @@ -1125,7 +1125,7 @@ v3d_nir_lower_gs_late(struct v3d_compile *c) } /* Note: GS output scalarizing must happen after nir_lower_clip_gs. */ - NIR_PASS_V(c->s, nir_lower_io_to_scalar, nir_var_shader_out, NULL, NULL); + NIR_PASS(_, c->s, nir_lower_io_to_scalar, nir_var_shader_out, NULL, NULL); } static void @@ -1134,12 +1134,12 @@ v3d_nir_lower_vs_late(struct v3d_compile *c) if (c->key->ucp_enables) { NIR_PASS(_, c->s, nir_lower_clip_vs, c->key->ucp_enables, false, true, NULL); - NIR_PASS_V(c->s, nir_lower_io_to_scalar, - nir_var_shader_out, NULL, NULL); + NIR_PASS(_, c->s, nir_lower_io_to_scalar, + nir_var_shader_out, NULL, NULL); } /* Note: VS output scalarizing must happen after nir_lower_clip_vs. */ - NIR_PASS_V(c->s, nir_lower_io_to_scalar, nir_var_shader_out, NULL, NULL); + NIR_PASS(_, c->s, nir_lower_io_to_scalar, nir_var_shader_out, NULL, NULL); } static void @@ -1155,7 +1155,7 @@ v3d_nir_lower_fs_late(struct v3d_compile *c) if (c->key->ucp_enables) NIR_PASS(_, c->s, nir_lower_clip_fs, c->key->ucp_enables, true, false); - NIR_PASS_V(c->s, nir_lower_io_to_scalar, nir_var_shader_in, NULL, NULL); + NIR_PASS(_, c->s, nir_lower_io_to_scalar, nir_var_shader_in, NULL, NULL); } static uint32_t @@ -1830,7 +1830,7 @@ v3d_attempt_compile(struct v3d_compile *c) nir_move_const_undef | buffer_opts); - NIR_PASS_V(c->s, nir_trivialize_registers); + NIR_PASS(_, c->s, nir_trivialize_registers); v3d_nir_to_vir(c); }