Module: Mesa
Branch: master
Commit: d66dc343164c19efe9f42cd32d0b28b40e384ef8
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d66dc343164c19efe9f42cd32d0b28b40e384ef8
Author: Rob Clark <robdcl...@gmail.com>
Date: Fri Apr 6 16:03:07 2018 -0400
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 <robdcl...@gmail.com>
Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net>
---
src/mesa/state_tracker/st_nir_lower_builtin.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mesa/state_tracker/st_nir_lower_builtin.c
b/src/mesa/state_tracker/st_nir_lower_builtin.c
index fca0bef665..660fdf3f91 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;
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
