nir: fix gathering patch IO usage with lowered IO
Fixes: 17af07024df - 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 e78c089aae5789d2ad2698beb9f13c12736f7443)
diff --git a/.pick_status.json b/.pick_status.json
index 45c006b..1f6f869 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -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"
},
diff --git a/src/compiler/nir/nir_gather_info.c b/src/compiler/nir/nir_gather_info.c
index c12dc0f..4f763f9 100644
--- a/src/compiler/nir/nir_gather_info.c
+++ b/src/compiler/nir/nir_gather_info.c
@@ -313,7 +313,19 @@
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) {