summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2015-11-02 21:43:40 -0800
committerEmil Velikov <emil.l.velikov@gmail.com>2015-11-07 15:17:49 +0000
commit7cfd87ce84f259f928efaaa4d2a5e340634ed058 (patch)
tree3549242556594b52ea04ad3d20e77c813b1c8530
parent5f565d7645f3a5138ad208875bce0efd32ea3bd8 (diff)
nir: Properly invalidate metadata in nir_opt_remove_phis().
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com> Reviewed-by: Eduardo Lima Mitev <elima@igalia.com> Cc: mesa-stable@lists.freedesktop.org (cherry picked from commit 59bbe2681b73c3795b7298e2486d5fde7c464ed5)
-rw-r--r--src/glsl/nir/nir_opt_remove_phis.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/glsl/nir/nir_opt_remove_phis.c b/src/glsl/nir/nir_opt_remove_phis.c
index 7896584b4e4..b5296f14411 100644
--- a/src/glsl/nir/nir_opt_remove_phis.c
+++ b/src/glsl/nir/nir_opt_remove_phis.c
@@ -92,6 +92,11 @@ remove_phis_impl(nir_function_impl *impl)
nir_foreach_block(impl, remove_phis_block, &progress);
+ if (progress) {
+ nir_metadata_preserve(impl, nir_metadata_block_index |
+ nir_metadata_dominance);
+ }
+
return progress;
}