From 0068dbee9681abd05bfbc5cb2e259a2362cacb72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= Date: Fri, 17 Mar 2023 12:19:10 -0700 Subject: [PATCH] ac/nir/ngg: Move divergence analysis call to analyze_shader_before_culling. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It actually belongs there. Signed-off-by: Timur Kristóf Reviewed-by: Qiang Yu Part-of: --- src/amd/common/ac_nir_lower_ngg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/amd/common/ac_nir_lower_ngg.c b/src/amd/common/ac_nir_lower_ngg.c index e7ce1ecc10c..8f28f837daf 100644 --- a/src/amd/common/ac_nir_lower_ngg.c +++ b/src/amd/common/ac_nir_lower_ngg.c @@ -1057,6 +1057,9 @@ analyze_shader_before_culling_walk(nir_ssa_def *ssa, static void analyze_shader_before_culling(nir_shader *shader, lower_ngg_nogs_state *nogs_state) { + /* We need divergence info for culling shaders. */ + nir_divergence_analysis(shader); + nir_foreach_function(func, shader) { nir_foreach_block(block, func->impl) { nir_foreach_instr(instr, block) { @@ -2284,8 +2287,6 @@ ac_nir_lower_ngg_nogs(nir_shader *shader, const ac_nir_lower_ngg_options *option nir_builder_init(b, impl); if (options->can_cull) { - /* We need divergence info for culling shaders. */ - nir_divergence_analysis(shader); analyze_shader_before_culling(shader, &state); save_reusable_variables(b, &state); }