fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 04:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

rusticl/kernel: call nir_lower_variable_initializers earlier

Browse source 
Fixes spirv_new spirv14_nonwriteable_decoration

Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33327>
(cherry picked from commit 2f4931353f)
This commit is contained in:
Karol Herbst 2025-01-31 01:43:56 +01:00 • committed by Eric Engestrom
parent 8d50d42514
commit a1d5a8ea97
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -44,7 +44,7 @@
"description": "rusticl/kernel: call nir_lower_variable_initializers earlier",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

6
src/gallium/frontends/rusticl/core/kernel.rs
View file

@ -639,6 +639,12 @@ fn compile_nir_to_args(
nir_pass!(nir, nir_scale_fdiv);
nir.set_workgroup_size_variable_if_zero();
nir.structurize();
nir_pass!(
nir,
nir_lower_variable_initializers,
nir_variable_mode::nir_var_function_temp
);
while {
let mut progress = false;
nir_pass!(nir, nir_split_var_copies);

5
src/gallium/frontends/rusticl/mesa/compiler/nir.rs
View file

@ -259,11 +259,6 @@ impl NirShader {
}
pub fn inline(&mut self, libclc: &NirShader) {
nir_pass!(
self,
nir_lower_variable_initializers,
nir_variable_mode::nir_var_function_temp,
);
nir_pass!(self, nir_lower_returns);
nir_pass!(self, nir_link_shader_functions, libclc.nir.as_ptr());
nir_pass!(self, nir_inline_functions);