<div dir="ltr"><div>Yeah, that's bad. 3-4 are<br><br></div>Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br></div><div class="gmail_extra"><br><div class="gmail_quote">On Sat, Apr 7, 2018 at 9:13 AM, Rob Clark <span dir="ltr"><<a href="mailto:robdclark@gmail.com" target="_blank">robdclark@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">At one point this kinda worked (or at least didn't cause problems). But<br>
with deref-instructions it results in dangling deref instructions not<br>
being properly removed.<br>
<br>
Signed-off-by: Rob Clark <<a href="mailto:robdclark@gmail.com">robdclark@gmail.com</a>><br>
---<br>
src/mesa/state_tracker/st_nir_<wbr>lower_builtin.c | 2 +-<br>
1 file changed, 1 insertion(+), 1 deletion(-)<br>
<br>
diff --git a/src/mesa/state_tracker/st_<wbr>nir_lower_builtin.c b/src/mesa/state_tracker/st_<wbr>nir_lower_builtin.c<br>
index fca0bef6653..660fdf3f910 100644<br>
--- a/src/mesa/state_tracker/st_<wbr>nir_lower_builtin.c<br>
+++ b/src/mesa/state_tracker/st_<wbr>nir_lower_builtin.c<br>
@@ -216,7 +216,7 @@ lower_builtin_block(lower_<wbr>builtin_state *state, nir_block *block)<br>
* to remove'd var. And we have to remove the original uniform<br>
* var since we don't want it to get uniform space allocated.<br>
*/<br>
- exec_node_remove(&intrin-><wbr>instr.node);<br>
+ nir_instr_remove(&intrin-><wbr>instr);<br>
}<br>
<br>
return true;<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.14.3<br>
<br>
</font></span></blockquote></div><br></div>