Module: Mesa Branch: staging/20.3 Commit: 6adf918d341557b1de43f09c0c668130dbdeb98d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6adf918d341557b1de43f09c0c668130dbdeb98d
Author: Gert Wollny <[email protected]> Date: Sat Nov 21 15:59:33 2020 +0100 r600/sfn: lower bool to int32 only after common optimizations Fixes: f79b7fcf7c7f5db626efdb63f27e8bc64d0aed77 r600/sfn: use 32 bit bools Signed-off-by: Gert Wollny <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7714> (cherry picked from commit 335c48ab330a5e3d7cc2bdd905eba44a3a80e982) --- .pick_status.json | 2 +- src/gallium/drivers/r600/sfn/sfn_nir.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 1f6f869d2f3..4e8041c1a20 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -310,7 +310,7 @@ "description": "r600/sfn: lower bool to int32 only after common optimizations", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "f79b7fcf7c7f5db626efdb63f27e8bc64d0aed77" }, diff --git a/src/gallium/drivers/r600/sfn/sfn_nir.cpp b/src/gallium/drivers/r600/sfn/sfn_nir.cpp index db7cf2f2b51..4676c52f3f0 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_nir.cpp @@ -830,11 +830,10 @@ int r600_shader_from_nir(struct r600_context *rctx, 40, r600_get_natural_size_align_bytes); - NIR_PASS_V(sel->nir, nir_lower_bool_to_int32); - while (optimize_once(sel->nir, true)); auto sh = nir_shader_clone(sel->nir, sel->nir); + NIR_PASS_V(sel->nir, nir_lower_bool_to_int32); NIR_PASS_V(sh, nir_opt_algebraic_late); if (sel->nir->info.stage == MESA_SHADER_FRAGMENT) _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
