Module: Mesa Branch: staging/20.2 Commit: e0cf53b12751fdc741eae123ac3817311e95375a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e0cf53b12751fdc741eae123ac3817311e95375a
Author: Marek Olšák <[email protected]> Date: Fri Nov 13 23:13:45 2020 -0500 ac/nir: fix a typo in ac_are_tessfactors_def_in_all_invocs I think it only made the pass return false if there was a barrier Fixes: 2832bc972bf - ac/nir_to_llvm: add ac_are_tessfactors_def_in_all_invocs() Reviewed-by: Timothy Arceri <[email protected]> Acked-by: Pierre-Eric Pelloux-Prayer <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7623> (cherry picked from commit 96593847445bd4f80ef65040dda5f74c26c7a80a) --- .pick_status.json | 2 +- src/amd/llvm/ac_nir_to_llvm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 03bfbbd09de..5471b86f698 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3595,7 +3595,7 @@ "description": "ac/nir: fix a typo in ac_are_tessfactors_def_in_all_invocs", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "2832bc972bfb512b314a3180a1258be984807760" }, diff --git a/src/amd/llvm/ac_nir_to_llvm.c b/src/amd/llvm/ac_nir_to_llvm.c index 025c8df91d7..10e58afc439 100644 --- a/src/amd/llvm/ac_nir_to_llvm.c +++ b/src/amd/llvm/ac_nir_to_llvm.c @@ -5132,7 +5132,7 @@ static void scan_tess_ctrl(nir_cf_node *cf_node, unsigned *upper_block_tf_writem * such segment that writes tess factor channels should write the same * channels in all codepaths within that segment. */ - if (upper_block_tf_writemask || cond_block_tf_writemask) { + if (*upper_block_tf_writemask || *cond_block_tf_writemask) { /* Accumulate the result: */ *tessfactors_are_def_in_all_invocs &= !(*cond_block_tf_writemask & ~(*upper_block_tf_writemask)); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
