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

nir/gather_info: fix gathering for compact arrayed builtins

Browse source 
these are treated as vecs, but depending on driver caps num_slots
may or may not equal the array size

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28554>
This commit is contained in:
Mike Blumenkrantz 2024-03-25 11:13:24 -04:00 • committed by Marge Bot
parent 843614f45a
commit a9d366085c
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/compiler/nir/nir_gather_info.c
View file

@ -442,8 +442,24 @@ gather_intrinsic_info(nir_intrinsic_instr *instr, nir_shader *shader,
slot_mask_16bit =
BITFIELD_RANGE(semantics.location - VARYING_SLOT_VAR0_16BIT, num_slots);
} else {
slot_mask = BITFIELD64_RANGE(semantics.location, semantics.num_slots);
assert(util_bitcount64(slot_mask) == semantics.num_slots);
unsigned num_slots = semantics.num_slots;
if (shader->options->compact_arrays &&
(instr->intrinsic != nir_intrinsic_load_input || shader->info.stage != MESA_SHADER_VERTEX)) {
/* clamp num_slots for compact arrays */
switch (semantics.location) {
case VARYING_SLOT_CLIP_DIST0:
case VARYING_SLOT_CLIP_DIST1:
case VARYING_SLOT_CULL_DIST0:
case VARYING_SLOT_CULL_DIST1:
case VARYING_SLOT_TESS_LEVEL_INNER:
case VARYING_SLOT_TESS_LEVEL_OUTER:
num_slots = DIV_ROUND_UP(num_slots, 4);
break;
default: break;
}
}
slot_mask = BITFIELD64_RANGE(semantics.location, num_slots);
assert(util_bitcount64(slot_mask) == num_slots);
}
}