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

gallium/auxiliary: Switch to use nir_foreach_function_impl

Browse source 
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23920>
This commit is contained in:
Yonggang Luo 2023-06-28 19:09:24 +08:00 • committed by Marge Bot
parent a8d669b593
commit a434217720
2 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gallium/auxiliary/nir/nir_draw_helpers.c
View file

@ -150,10 +150,8 @@ nir_lower_pstipple_fs(struct nir_shader *shader,
BITSET_SET(shader->info.samplers_used, binding);
state.stip_tex = tex_var;
nir_foreach_function(function, shader) {
if (function->impl) {
nir_lower_pstipple_impl(function->impl, &state);
}
nir_foreach_function_impl(impl, shader) {
nir_lower_pstipple_impl(impl, &state);
}
*samplerUnitOut = binding;
}
@ -440,9 +438,7 @@ nir_lower_aapoint_fs(struct nir_shader *shader, int *varying, const nir_alu_type
*varying = tgsi_get_generic_gl_varying_index(aapoint_input->data.location, true);
state.input = aapoint_input;
nir_foreach_function(function, shader) {
if (function->impl) {
nir_lower_aapoint_impl(function->impl, &state, bool_type);
}
nir_foreach_function_impl(impl, shader) {
nir_lower_aapoint_impl(impl, &state, bool_type);
}
}

12
src/gallium/auxiliary/nir/tgsi_to_nir.c
View file

@ -2569,16 +2569,14 @@ lower_clipdistance_to_array(nir_shader *nir)
/* resize VARYING_SLOT_CLIP_DIST0 to the full array size */
dist0->type = glsl_array_type(glsl_float_type(), nir->info.clip_distance_array_size, sizeof(float));
struct set *deletes = _mesa_set_create(NULL, _mesa_hash_pointer, _mesa_key_pointer_equal);
nir_foreach_function(function, nir) {
nir_foreach_function_impl(impl, nir) {
bool func_progress = false;
if (!function->impl)
continue;
nir_builder b = nir_builder_create(function->impl);
b.cursor = nir_before_block(nir_start_block(function->impl));
nir_builder b = nir_builder_create(impl);
b.cursor = nir_before_block(nir_start_block(impl));
/* create a new deref for the arrayed clipdistance variable at the start of the function */
nir_deref_instr *clipdist_deref = nir_build_deref_var(&b, dist0);
nir_ssa_def *zero = nir_imm_zero(&b, 1, 32);
nir_foreach_block(block, function->impl) {
nir_foreach_block(block, impl) {
nir_foreach_instr_safe(instr, block) {
/* filter through until a clipdistance store is reached */
if (instr->type != nir_instr_type_intrinsic)
@ -2609,7 +2607,7 @@ lower_clipdistance_to_array(nir_shader *nir)
}
}
if (func_progress)
nir_metadata_preserve(function->impl, nir_metadata_none);
nir_metadata_preserve(impl, nir_metadata_none);
/* derefs must be queued for deletion to avoid deleting the same deref repeatedly */
set_foreach_remove(deletes, he)
nir_instr_remove((void*)he->key);