summaryrefslogtreecommitdiffstats
path: root/src/glsl
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2015-11-02 21:28:26 -0800
committerKenneth Graunke <kenneth@whitecape.org>2015-11-03 17:06:48 -0800
commit4cb7546066f3f06b8030b8fce78f82469b0c6980 (patch)
tree036ce90b72cc7d5c8a1303df26908d76e00fba31 /src/glsl
parent8bb44510fca5315bbdd61502c72c22c7198c0daf (diff)
downloadexternal_mesa3d-4cb7546066f3f06b8030b8fce78f82469b0c6980.zip
external_mesa3d-4cb7546066f3f06b8030b8fce78f82469b0c6980.tar.gz
external_mesa3d-4cb7546066f3f06b8030b8fce78f82469b0c6980.tar.bz2
nir: Properly invalidate metadata in nir_remove_dead_variables().
v2: Preserve live_variables too (Jason). Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com> Reviewed-by: Eduardo Lima Mitev <elima@igalia.com>
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/nir/nir_remove_dead_variables.c10
1 files 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 d6783e7..530a847 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);