i965: Fix infinite loop regression in intel_miptree_all_slices_resolve.

Commit 0ed11e333147e280208d9d0b3ff3f39970547643 fixed a "use after free"
bug by getting the next pointer before deleting the current node.

Unfortunately, it also made "next" never get updated if i->need != need.

Fixes infinite loops in piglit tests fbo-depth-array and fbo-depthtex.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
index 7787c1a87af0c880943f37c6927eca3fec2014a8..4e1a502a51ba0a91853599714e1dca478746f87f 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
@@ -643,10 +643,10 @@ intel_miptree_all_slices_resolve(struct intel_context *intel,
    struct intel_resolve_map *i, *next;
 
    for (i = mt->hiz_map.next; i; i = next) {
+      next = i->next;
       if (i->need != need)
         continue;
       func(intel, mt, i->level, i->layer);
-      next = i->next;
       intel_resolve_map_remove(i);
       did_resolve = true;
    }