fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nir/lower_io_to_scalar: don't create output stores that have no effect

Browse source 
This fixes NIR validation errors that happen with certain shaders.

Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29406>
This commit is contained in:
Marek Olšák 2024-05-26 23:00:02 -04:00 • committed by Marge Bot
parent 756b4f907e
commit 0058989357
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/compiler/nir/nir_lower_io_to_scalar.c
View file

@ -144,6 +144,30 @@ lower_store_output_to_scalar(nir_builder *b, nir_intrinsic_instr *intr)
unsigned newi = is_64bit ? i * 2 : i;
unsigned newc = nir_intrinsic_component(intr);
unsigned new_component = (newc + newi) % 4;
nir_io_semantics sem = nir_intrinsic_io_semantics(intr);
bool has_xfb = false;
if (nir_intrinsic_has_io_xfb(intr)) {
/* Find out which components are written via xfb. */
for (unsigned c = 0; c <= new_component; c++) {
nir_io_xfb xfb = c < 2 ? nir_intrinsic_io_xfb(intr) : nir_intrinsic_io_xfb2(intr);
if (new_component < c + xfb.out[c % 2].num_components) {
has_xfb = true;
break;
}
}
}
/* After scalarization, some channels might not write anywhere - i.e.
* they are not a sysval output, they don't feed the next shader, and
* they don't write xfb. Don't create such stores.
*/
if ((sem.no_sysval_output ||
!nir_slot_is_sysval_output(sem.location, MESA_SHADER_NONE)) &&
(sem.no_varying || !nir_slot_is_varying(sem.location)) &&
!has_xfb)
continue;
nir_intrinsic_instr *chan_intr =
nir_intrinsic_instr_create(b->shader, intr->intrinsic);