From 2540e45e1a1c281c42bc0379aab85ea5a1f62344 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= Date: Tue, 18 Feb 2025 17:33:48 +0100 Subject: [PATCH] nak: Don't use deprecated NIR_PASS_V macro anymore. Reviewed-by: Alyssa Rosenzweig Part-of: --- src/nouveau/compiler/nak_nir.c | 2 +- src/nouveau/compiler/nak_nir_lower_fs_inputs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nouveau/compiler/nak_nir.c b/src/nouveau/compiler/nak_nir.c index 3631426d390..2c3f52be6d1 100644 --- a/src/nouveau/compiler/nak_nir.c +++ b/src/nouveau/compiler/nak_nir.c @@ -18,7 +18,7 @@ this_progress; \ }) -#define OPT_V(nir, pass, ...) NIR_PASS_V(nir, pass, ##__VA_ARGS__) +#define OPT_V(nir, pass, ...) NIR_PASS(_, nir, pass, ##__VA_ARGS__) bool nak_nir_workgroup_has_one_subgroup(const nir_shader *nir) diff --git a/src/nouveau/compiler/nak_nir_lower_fs_inputs.c b/src/nouveau/compiler/nak_nir_lower_fs_inputs.c index 87d8df66fa8..3e7445cb25e 100644 --- a/src/nouveau/compiler/nak_nir_lower_fs_inputs.c +++ b/src/nouveau/compiler/nak_nir_lower_fs_inputs.c @@ -401,7 +401,7 @@ nak_nir_lower_fs_inputs(nir_shader *nir, .nak = nak, .fs_key = fs_key, }; - NIR_PASS_V(nir, nir_shader_intrinsics_pass, lower_fs_input_intrin, + NIR_PASS(_, nir, nir_shader_intrinsics_pass, lower_fs_input_intrin, nir_metadata_control_flow, (void *)&fs_in_ctx);