Mesa (staging/19.1): nir: Actually propagate progress in nir_opt_move_load_ubo.

[GitLab Mirror]

Module: Mesa
Branch: staging/19.1
Commit: b2c5c1666870d23df395e97642e67be57fe4f4de
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b2c5c1666870d23df395e97642e67be57fe4f4de

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Thu May 30 22:48:46 2019 +0200

nir: Actually propagate progress in nir_opt_move_load_ubo.

Found with Jasons new metadata rework (https://gitlab.freedesktop.org/mesa/mesa/merge_requests/950).

Fixes: af355aaa071 "nir: add nir_opt_move_load_ubo() optimization pass"
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
(cherry picked from commit e24a7840f60ac2290761ea2dc2831e8c3ba8bbfc)

---

 src/compiler/nir/nir_opt_move_load_ubo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/nir/nir_opt_move_load_ubo.c b/src/compiler/nir/nir_opt_move_load_ubo.c
index a32f1704427..f36a62a5308 100644
--- a/src/compiler/nir/nir_opt_move_load_ubo.c
+++ b/src/compiler/nir/nir_opt_move_load_ubo.c
@@ -91,7 +91,7 @@ move_load_ubo(nir_block *block)
       }
    }
 
-   return false;
+   return progress;
 }
 
 bool