From 4cb7546066f3f06b8030b8fce78f82469b0c6980 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Mon, 2 Nov 2015 21:28:26 -0800 Subject: [PATCH] nir: Properly invalidate metadata in nir_remove_dead_variables(). v2: Preserve live_variables too (Jason). Signed-off-by: Kenneth Graunke Reviewed-by: Jason Ekstrand Reviewed-by: Eduardo Lima Mitev --- src/glsl/nir/nir_remove_dead_variables.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/glsl/nir/nir_remove_dead_variables.c b/src/glsl/nir/nir_remove_dead_variables.c index d6783e78803..530a8475ed5 100644 --- a/src/glsl/nir/nir_remove_dead_variables.c +++ b/src/glsl/nir/nir_remove_dead_variables.c @@ -126,8 +126,14 @@ nir_remove_dead_variables(nir_shader *shader) progress = remove_dead_vars(&shader->globals, live) || progress; nir_foreach_overload(shader, overload) { - if (overload->impl) - progress = remove_dead_vars(&overload->impl->locals, live) || progress; + if (overload->impl) { + if (remove_dead_vars(&overload->impl->locals, live)) { + nir_metadata_preserve(overload->impl, nir_metadata_block_index | + nir_metadata_dominance | + nir_metadata_live_variables); + progress = true; + } + } } _mesa_set_destroy(live, NULL); -- 2.30.2