From d455074cc8fcfadd7edc2c08448a53e095b79577 Mon Sep 17 00:00:00 2001 From: jhananit Date: Tue, 24 Jun 2025 19:22:11 +0000 Subject: [PATCH] i915: Remove NIR_PASS_V and updated it to NIR_PASS Reviewed-by: Alyssa Rosenzweig Reviewed-by: Christian Gmeiner Reviewed-by: Lionel Landwerlin Part-of: --- src/gallium/drivers/i915/i915_screen.c | 5 ++--- src/gallium/drivers/i915/i915_state.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/i915/i915_screen.c b/src/gallium/drivers/i915/i915_screen.c index 6a82f61eeeb..60c6c697c06 100644 --- a/src/gallium/drivers/i915/i915_screen.c +++ b/src/gallium/drivers/i915/i915_screen.c @@ -193,8 +193,7 @@ i915_optimize_nir(struct nir_shader *s) do { progress = false; - NIR_PASS_V(s, nir_lower_vars_to_ssa); - + NIR_PASS(progress, s, nir_lower_vars_to_ssa); NIR_PASS(progress, s, nir_copy_prop); NIR_PASS(progress, s, nir_opt_algebraic); NIR_PASS(progress, s, nir_opt_constant_folding); @@ -233,7 +232,7 @@ i915_optimize_nir(struct nir_shader *s) /* Group texture loads together to try to avoid hitting the * texture indirection phase limit. */ - NIR_PASS_V(s, nir_group_loads, nir_group_all, ~0); + NIR_PASS(_, s, nir_group_loads, nir_group_all, ~0); } static char * diff --git a/src/gallium/drivers/i915/i915_state.c b/src/gallium/drivers/i915/i915_state.c index 46ac0a4b261..75e487e84ec 100644 --- a/src/gallium/drivers/i915/i915_state.c +++ b/src/gallium/drivers/i915/i915_state.c @@ -672,7 +672,7 @@ i915_create_vs_state(struct pipe_context *pipe, if (templ->type == PIPE_SHADER_IR_NIR) { nir_shader *s = templ->ir.nir; - NIR_PASS_V(s, nir_lower_point_size, 1.0, 255.0); + NIR_PASS(_, s, nir_lower_point_size, 1.0, 255.0); /* The gallivm draw path doesn't support non-native-integers NIR shaders, * st/mesa does native-integers for the screen as a whole rather than