Mesa (master): nir/lower_double_ops: Rework the if (progress) tree
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri May 22 19:05:49 UTC 2020
Module: Mesa
Branch: master
Commit: 111b0a669979cf277f31c69f501982fee004e067
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=111b0a669979cf277f31c69f501982fee004e067
Author: Jason Ekstrand <jason at jlekstrand.net>
Date: Fri May 24 09:05:32 2019 -0500
nir/lower_double_ops: Rework the if (progress) tree
Fixes: d7d35a9522 "nir/lower_doubles: Use the new NIR lowering..."
Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5170>
---
src/compiler/nir/nir_lower_double_ops.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/compiler/nir/nir_lower_double_ops.c b/src/compiler/nir/nir_lower_double_ops.c
index bb2476523ec..f9c93a910a5 100644
--- a/src/compiler/nir/nir_lower_double_ops.c
+++ b/src/compiler/nir/nir_lower_double_ops.c
@@ -753,7 +753,14 @@ nir_lower_doubles_impl(nir_function_impl *impl,
* inlining.
*/
nir_opt_deref_impl(impl);
- }
+ } else if (progress) {
+ nir_metadata_preserve(impl, nir_metadata_block_index |
+ nir_metadata_dominance);
+ } else {
+#ifndef NDEBUG
+ impl->valid_metadata &= ~nir_metadata_not_properly_reset;
+#endif
+ }
return progress;
}
More information about the mesa-commit
mailing list