Module: Mesa Branch: staging/20.3 Commit: 33d70876820ce1285482df79528f619aecd0b080 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=33d70876820ce1285482df79528f619aecd0b080
Author: Marek Olšák <[email protected]> Date: Fri Nov 13 00:09:06 2020 -0500 nir: fix gathering TCS cross invocation access with lowered IO Fixes: abe9588ff04 - nir: gather tess.tcs_cross_invocation info from lowered IO intrinsics Acked-by: Pierre-Eric Pelloux-Prayer <[email protected]> Reviewed-by: Timur Kristóf <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7622> (cherry picked from commit aadfdb962ffa425a230d972c28351c8879072b6b) --- .pick_status.json | 2 +- src/compiler/nir/nir_gather_info.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 01b8e9eb947..45c006b2ca9 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -337,7 +337,7 @@ "description": "nir: fix gathering TCS cross invocation access with lowered IO", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "abe9588ff048656c94d2074ca3d852ac371e0c7b" }, diff --git a/src/compiler/nir/nir_gather_info.c b/src/compiler/nir/nir_gather_info.c index 2271f8b6b7a..c12dc0f6939 100644 --- a/src/compiler/nir/nir_gather_info.c +++ b/src/compiler/nir/nir_gather_info.c @@ -29,10 +29,10 @@ static bool src_is_invocation_id(const nir_src *src) { assert(src->is_ssa); - if (src->parent_instr->type != nir_instr_type_intrinsic) + if (src->ssa->parent_instr->type != nir_instr_type_intrinsic) return false; - return nir_instr_as_intrinsic(src->parent_instr)->intrinsic == + return nir_instr_as_intrinsic(src->ssa->parent_instr)->intrinsic == nir_intrinsic_load_invocation_id; } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
