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

treewide: port remaining nir_metadata_preserve users

Browse source 
apply our semantic patch manually to the remaining users. Coccinelle bailed on
these files for whatever reason, I guess.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Georg Lehmann <dadschoorse@gmail.com>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33722>
This commit is contained in:
Alyssa Rosenzweig 2025-02-24 15:19:33 -05:00 • committed by Marge Bot
parent 9a58a8257e
commit ff94b155ab
4 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/compiler/nir/nir_lower_cl_images.c
View file

@ -291,11 +291,5 @@ nir_lower_cl_images(nir_shader *shader, bool lower_image_derefs, bool lower_samp
}
}
if (progress) {
nir_metadata_preserve(impl, nir_metadata_control_flow);
} else {
nir_metadata_preserve(impl, nir_metadata_all);
}
return progress;
return nir_progress(progress, impl, nir_metadata_control_flow);
}

4
src/compiler/nir/nir_lower_shader_calls.c
View file

@ -797,9 +797,7 @@ spill_ssa_defs_and_lower_shader_calls(nir_shader *shader, uint32_t num_calls,
ralloc_free(mem_ctx);
nir_metadata_preserve(impl, nir_metadata_control_flow);
return true;
return nir_progress(true, impl, nir_metadata_control_flow);
}
static nir_instr *

4
src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp
View file

@ -551,7 +551,5 @@ r600_append_tcs_TF_emission(nir_shader *shader, enum mesa_prim prim_type)
nir_pop_if(b, nullptr);
nir_metadata_preserve(f->impl, nir_metadata_none);
return true;
return nir_progress(true, f->impl, nir_metadata_none);
}

5
src/intel/compiler/elk/elk_fs.cpp
View file

@ -6532,10 +6532,7 @@ elk_nir_move_interpolation_to_top(nir_shader *nir)
}
}
progress = progress || impl_progress;
nir_metadata_preserve(impl, impl_progress ? nir_metadata_control_flow
: nir_metadata_all);
progress |= nir_progress(impl_progress, impl, nir_metadata_control_flow);
}
return progress;