Mesa (master): nir/lower_memory_model: return progress when visiting instructions

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Sep 28 15:03:06 UTC 2020


Module: Mesa
Branch: master
Commit: de1409089c797cc3dfae968748610d57329ec555
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=de1409089c797cc3dfae968748610d57329ec555

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Mon Sep 28 11:46:25 2020 +0200

nir/lower_memory_model: return progress when visiting instructions

It never returned progress=TRUE.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6888>

---

 src/compiler/nir/nir_lower_memory_model.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/nir/nir_lower_memory_model.c b/src/compiler/nir/nir_lower_memory_model.c
index 1dafa52869c..068dfc1af79 100644
--- a/src/compiler/nir/nir_lower_memory_model.c
+++ b/src/compiler/nir/nir_lower_memory_model.c
@@ -180,7 +180,7 @@ lower_make_visible(nir_cf_node *cf_node, uint32_t *cur_modes)
    case nir_cf_node_block: {
       nir_block *block = nir_cf_node_as_block(cf_node);
       nir_foreach_instr(instr, block)
-         visit_instr(instr, cur_modes, NIR_MEMORY_MAKE_VISIBLE);
+         progress |= visit_instr(instr, cur_modes, NIR_MEMORY_MAKE_VISIBLE);
       break;
    }
    case nir_cf_node_if: {
@@ -219,7 +219,7 @@ lower_make_available(nir_cf_node *cf_node, uint32_t *cur_modes)
    case nir_cf_node_block: {
       nir_block *block = nir_cf_node_as_block(cf_node);
       nir_foreach_instr_reverse(instr, block)
-         visit_instr(instr, cur_modes, NIR_MEMORY_MAKE_AVAILABLE);
+         progress |= visit_instr(instr, cur_modes, NIR_MEMORY_MAKE_AVAILABLE);
       break;
    }
    case nir_cf_node_if: {



More information about the mesa-commit mailing list