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

radeonsi: handle nir_intrinsic_component in kill_ps_outputs

Browse source 
The assertion was failing with AMD_DEBUG=mono.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32186>
This commit is contained in:
Marek Olšák 2024-11-17 11:30:56 -05:00 • committed by Marge Bot
parent 5be9d76861
commit 48c1c6247c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/radeonsi/si_shader.c
View file

@ -1748,8 +1748,8 @@ static bool kill_ps_outputs_cb(struct nir_builder *b, nir_instr *instr, void *_k
}
/* Color outputs. */
unsigned comp_mask = BITFIELD_MASK(intr->num_components);
assert(nir_intrinsic_component(intr) == 0);
unsigned component = nir_intrinsic_component(intr);
unsigned comp_mask = BITFIELD_RANGE(component, intr->num_components);
unsigned cb_shader_mask = ac_get_cb_shader_mask(key->ps.part.epilog.spi_shader_col_format);
/* Preserve alpha if ALPHA_TESTING is enabled. */
@ -1779,7 +1779,7 @@ static bool kill_ps_outputs_cb(struct nir_builder *b, nir_instr *instr, void *_k
nir_def *new_value = intr->src[0].ssa;
nir_def *undef = nir_undef(b, 1, new_value->bit_size);
unsigned kill_mask = ~output_mask & comp_mask;
unsigned kill_mask = (~output_mask & comp_mask) >> component;
u_foreach_bit(i, kill_mask) {
new_value = nir_vector_insert_imm(b, new_value, undef, i);
}