OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rusticl/kernel: only handle function_temp memory before lowering printf

Browse Source 
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: 5795ee0e08 ("rusticl: translate spirv to nir and first steps to kernel arg handling")
Signed-off-by: Karol Herbst <git@karolherbst.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24398>
This commit is contained in:
Karol Herbst
2023-07-31 12:19:22 +02:00
committed by Marge Bot
parent 5fc5123f63
commit 01cb01a7ee
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gallium/frontends/rusticl/core/kernel.rs
View File

@@ -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),
);