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

asahi: rm always true param

Browse source 
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29179>
This commit is contained in:
Alyssa Rosenzweig 2024-05-09 10:46:32 -04:00 • committed by Marge Bot
parent 52211088a2
commit a2094e8142
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/asahi/lib/agx_nir_lower_gs.c
View file

@ -368,14 +368,12 @@ agx_nir_lower_sw_vs_id(nir_shader *s)
static bool
lower_id(nir_builder *b, nir_intrinsic_instr *intr, void *data)
{
bool *lower_instance = data;
b->cursor = nir_before_instr(&intr->instr);
nir_def *id;
if (intr->intrinsic == nir_intrinsic_load_primitive_id)
id = load_primitive_id(b);
else if (intr->intrinsic == nir_intrinsic_load_instance_id &&
*lower_instance)
else if (intr->intrinsic == nir_intrinsic_load_instance_id)
id = load_instance_id(b);
else if (intr->intrinsic == nir_intrinsic_load_flat_mask)
id = load_geometry_param(b, flat_outputs);
@ -416,9 +414,8 @@ agx_nir_create_geometry_count_shader(nir_shader *gs, const nir_shader *libagx,
NIR_PASS(_, shader, nir_shader_intrinsics_pass, lower_gs_count_instr,
nir_metadata_block_index | nir_metadata_dominance, state);
bool lower_instance = true;
NIR_PASS(_, shader, nir_shader_intrinsics_pass, lower_id,
nir_metadata_block_index | nir_metadata_dominance, &lower_instance);
nir_metadata_block_index | nir_metadata_dominance, NULL);
agx_preprocess_nir(shader, libagx);
return shader;
@ -480,8 +477,7 @@ lower_to_gs_rast(nir_builder *b, nir_intrinsic_instr *intr, void *data)
case nir_intrinsic_load_provoking_last:
case nir_intrinsic_load_input_topology_agx: {
/* Lowering the same in both GS variants */
bool lower_instance = true;
return lower_id(b, intr, &lower_instance);
return lower_id(b, intr, NULL);
}
case nir_intrinsic_end_primitive_with_counter:
@ -1266,9 +1262,8 @@ agx_nir_lower_gs(nir_shader *gs, const nir_shader *libagx,
*gs_copy = agx_nir_create_gs_rast_shader(gs, libagx);
bool lower_instance = true;
NIR_PASS(_, gs, nir_shader_intrinsics_pass, lower_id,
nir_metadata_block_index | nir_metadata_dominance, &lower_instance);
nir_metadata_block_index | nir_metadata_dominance, NULL);
link_libagx(gs, libagx);
@ -1347,7 +1342,7 @@ agx_nir_lower_gs(nir_shader *gs, const nir_shader *libagx,
NIR_PASS(_, gs, nir_opt_move, ~0);
NIR_PASS(_, gs, nir_shader_intrinsics_pass, lower_id,
nir_metadata_block_index | nir_metadata_dominance, &lower_instance);
nir_metadata_block_index | nir_metadata_dominance, NULL);
/* Create auxiliary programs */
*pre_gs = agx_nir_create_pre_gs(