From ff24eeee2080158eaad634b83fdc86c13ee1e427 Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Fri, 28 Oct 2022 01:44:45 +0200 Subject: [PATCH] rusticl/kernel: lower system values before gathering info Signed-off-by: Karol Herbst Part-of: --- src/gallium/frontends/rusticl/core/kernel.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/gallium/frontends/rusticl/core/kernel.rs b/src/gallium/frontends/rusticl/core/kernel.rs index 927b1592e1d..4d055dc1c50 100644 --- a/src/gallium/frontends/rusticl/core/kernel.rs +++ b/src/gallium/frontends/rusticl/core/kernel.rs @@ -486,7 +486,13 @@ fn lower_and_optimize_nir_late( ); } + // run before gather info + nir.pass0(nir_lower_system_values); + let mut compute_options = nir_lower_compute_system_values_options::default(); + compute_options.set_has_base_global_invocation_id(true); + nir.pass1(nir_lower_compute_system_values, &compute_options); nir.pass1(nir_shader_gather_info, nir.entrypoint()); + if nir.num_images() > 0 { res.push(InternalKernelArg { kind: InternalKernelArgType::FormatArray, @@ -539,10 +545,6 @@ fn lower_and_optimize_nir_late( nir_variable_mode::nir_var_mem_global | nir_variable_mode::nir_var_mem_constant, global_address_format, ); - nir.pass0(nir_lower_system_values); - let mut compute_options = nir_lower_compute_system_values_options::default(); - compute_options.set_has_base_global_invocation_id(true); - nir.pass1(nir_lower_compute_system_values, &compute_options); nir.pass1(rusticl_lower_intrinsics, &mut lower_state); nir.pass2(