From: Rob Clark Date: Fri, 6 Apr 2018 20:03:07 +0000 (-0400) Subject: mesa/st/nir: fix instruction removal X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d66dc343164c19efe9f42cd32d0b28b40e384ef8;p=mesa.git mesa/st/nir: fix instruction removal At one point this kinda worked (or at least didn't cause problems). But with deref-instructions it results in dangling deref instructions not being properly removed. Signed-off-by: Rob Clark Reviewed-by: Jason Ekstrand --- diff --git a/src/mesa/state_tracker/st_nir_lower_builtin.c b/src/mesa/state_tracker/st_nir_lower_builtin.c index fca0bef6653..660fdf3f910 100644 --- a/src/mesa/state_tracker/st_nir_lower_builtin.c +++ b/src/mesa/state_tracker/st_nir_lower_builtin.c @@ -216,7 +216,7 @@ lower_builtin_block(lower_builtin_state *state, nir_block *block) * to remove'd var. And we have to remove the original uniform * var since we don't want it to get uniform space allocated. */ - exec_node_remove(&intrin->instr.node); + nir_instr_remove(&intrin->instr); } return true;