From b94bcf0318f28eb9f75e7c238d3bd4fd606aee0a Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Tue, 5 Nov 2024 09:52:40 -0400 Subject: [PATCH] asahi: fix a2c with sample shading, harder Fixes: 9bbe93d1589 ("hk: fix alpha-to-coverage with sample shading") Signed-off-by: Alyssa Rosenzweig Part-of: --- src/asahi/lib/agx_nir_prolog_epilog.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/asahi/lib/agx_nir_prolog_epilog.c b/src/asahi/lib/agx_nir_prolog_epilog.c index 99a4bcb6a01..fcd3e442cfe 100644 --- a/src/asahi/lib/agx_nir_prolog_epilog.c +++ b/src/asahi/lib/agx_nir_prolog_epilog.c @@ -448,16 +448,17 @@ agx_nir_fs_epilog(nir_builder *b, const void *key_) * to the epilog, when sample shading is not used but blending is. */ if (key->link.sample_shading) { - NIR_PASS(_, b->shader, agx_nir_lower_to_per_sample); - NIR_PASS(_, b->shader, agx_nir_lower_fs_active_samples_to_register); - /* Lower the resulting discards. Done in agx_nir_lower_monolithic_msaa for - * the pixel shaded path. + * the pixel shaded path. Must be done before agx_nir_lower_to_per_sample + * to avoid duplicating tests. */ if (key->blend.alpha_to_coverage) { NIR_PASS(_, b->shader, agx_nir_lower_sample_mask); } + NIR_PASS(_, b->shader, agx_nir_lower_to_per_sample); + NIR_PASS(_, b->shader, agx_nir_lower_fs_active_samples_to_register); + /* Ensure the sample ID is preserved in register. We do this late since it * has to go in the last block, and the above passes might add control * flow when lowering.