From: Karol Herbst Date: Mon, 31 Jul 2023 10:19:22 +0000 (+0200) Subject: rusticl/kernel: only handle function_temp memory before lowering printf X-Git-Tag: upstream/23.3.3~4896 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=01cb01a7ee9781dd494681433c7d40828c7b53c6;p=platform%2Fupstream%2Fmesa.git rusticl/kernel: only handle function_temp memory before lowering printf There was no need to handle the other variable modes. This also fixes double accounting of shared memory. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9058 Fixes: 5795ee0e083 ("rusticl: translate spirv to nir and first steps to kernel arg handling") Signed-off-by: Karol Herbst Part-of: --- diff --git a/src/gallium/frontends/rusticl/core/kernel.rs b/src/gallium/frontends/rusticl/core/kernel.rs index f46992a..d3c287b 100644 --- a/src/gallium/frontends/rusticl/core/kernel.rs +++ b/src/gallium/frontends/rusticl/core/kernel.rs @@ -400,12 +400,7 @@ fn lower_and_optimize_nir_pre_inputs(dev: &Device, nir: &mut NirShader, lib_clc: nir.pass0(nir_dedup_inline_samplers); nir.pass2( nir_lower_vars_to_explicit_types, - nir_variable_mode::nir_var_uniform - | nir_variable_mode::nir_var_function_temp - | nir_variable_mode::nir_var_shader_temp - | nir_variable_mode::nir_var_mem_shared - | nir_variable_mode::nir_var_mem_generic - | nir_variable_mode::nir_var_mem_global, + nir_variable_mode::nir_var_function_temp, Some(glsl_get_cl_type_size_align), ); @@ -603,8 +598,10 @@ fn lower_and_optimize_nir_late( nir_lower_vars_to_explicit_types, nir_variable_mode::nir_var_mem_shared | nir_variable_mode::nir_var_function_temp + | nir_variable_mode::nir_var_shader_temp | nir_variable_mode::nir_var_uniform - | nir_variable_mode::nir_var_mem_global, + | nir_variable_mode::nir_var_mem_global + | nir_variable_mode::nir_var_mem_generic, Some(glsl_get_cl_type_size_align), );