From b6c81b3ff453d51898f86a819f80ea1128aea0fe Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Fri, 12 Dec 2014 16:22:46 -0800 Subject: nir/metadata: Rename metadata_dirty to metadata_preserve nir_metadata_dirty was a terrible name because the parameter it takes is the metadata to be preserved. This is really confusing because it looks like it's doing the opposite of what it is actually doing. Now it's named sensibly. Reviewed-by: Connor Abbott --- src/glsl/nir/nir_from_ssa.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/glsl/nir/nir_from_ssa.c') diff --git a/src/glsl/nir/nir_from_ssa.c b/src/glsl/nir/nir_from_ssa.c index 9b7c931c072..f99ba9b7828 100644 --- a/src/glsl/nir/nir_from_ssa.c +++ b/src/glsl/nir/nir_from_ssa.c @@ -827,8 +827,10 @@ nir_convert_from_ssa_impl(nir_function_impl *impl) nir_foreach_block(impl, isolate_phi_nodes_block, &state); - nir_metadata_dirty(impl, nir_metadata_block_index | - nir_metadata_dominance); + /* Mark metadata as dirty before we ask for liveness analysis */ + nir_metadata_preserve(impl, nir_metadata_block_index | + nir_metadata_dominance); + nir_metadata_require(impl, nir_metadata_live_variables | nir_metadata_dominance); -- cgit v1.2.3