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

nir: fix gathering patch IO usage with lowered IO

Browse source 
Fixes: 17af07024d - nir: gather all IO info from IO intrinsics

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7622>
(cherry picked from commit e78c089aae)
This commit is contained in:
Marek Olšák 2020-11-14 20:06:55 -05:00 • committed by Dylan Baker
parent 33d7087682
commit 29f1078c18
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -328,7 +328,7 @@
"description": "nir: fix gathering patch IO usage with lowered IO",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "17af07024dfc8302b37a270cea4ef3eae06fe5e2"
},

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

@ -313,7 +313,19 @@ gather_intrinsic_info(nir_intrinsic_instr *instr, nir_shader *shader,
if (nir_intrinsic_infos[instr->intrinsic].index_map[NIR_INTRINSIC_IO_SEMANTICS] > 0) {
nir_io_semantics semantics = nir_intrinsic_io_semantics(instr);
if (semantics.location >= VARYING_SLOT_PATCH0) {
/* Generic per-patch I/O. */
assert((shader->info.stage == MESA_SHADER_TESS_EVAL &&
instr->intrinsic == nir_intrinsic_load_input) ||
(shader->info.stage == MESA_SHADER_TESS_CTRL &&
(instr->intrinsic == nir_intrinsic_load_output ||
instr->intrinsic == nir_intrinsic_store_output)));
semantics.location -= VARYING_SLOT_PATCH0;
}
slot_mask = BITFIELD64_RANGE(semantics.location, semantics.num_slots);
assert(util_bitcount64(slot_mask) == semantics.num_slots);
}
switch (instr->intrinsic) {