Module: Mesa Branch: staging/23.2 Commit: bcd8cbe9a529e9d2de73b98a36adaecf28eeffc9 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bcd8cbe9a529e9d2de73b98a36adaecf28eeffc9
Author: Marek Olšák <[email protected]> Date: Wed Jul 12 23:09:16 2023 -0400 Revert "ac/nir/ngg: Follow intrinsic sources when analyzing before culling." This reverts commit 411f69b9c5b884f6802758347e72a10ec5564df1. It broke tessellation in Unigine Heaven with radeonsi. Fixes: 411f69b9c5b884 - ac/nir/ngg: Follow intrinsic sources when analyzing before culling. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24160> (cherry picked from commit 043dcfad04d89c5b68a82f0c68638f38a85fdb05) --- .pick_status.json | 2 +- src/amd/common/ac_nir_lower_ngg.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index df6e523c96f..98dcaa4398a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -64,7 +64,7 @@ "description": "Revert \"ac/nir/ngg: Follow intrinsic sources when analyzing before culling.\"", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "411f69b9c5b884f6802758347e72a10ec5564df1", "notes": null diff --git a/src/amd/common/ac_nir_lower_ngg.c b/src/amd/common/ac_nir_lower_ngg.c index d32dae39e90..96e6367aa5f 100644 --- a/src/amd/common/ac_nir_lower_ngg.c +++ b/src/amd/common/ac_nir_lower_ngg.c @@ -1075,11 +1075,6 @@ analyze_shader_before_culling_walk(nir_ssa_def *ssa, break; } - const unsigned num_srcs = nir_intrinsic_infos[intrin->intrinsic].num_srcs; - for (unsigned i = 0; i < num_srcs; ++i) { - analyze_shader_before_culling_walk(intrin->src[i].ssa, flag, s); - } - break; } case nir_instr_type_alu: {
