From: Matt Turner <mattst88@gmail.com>
Date: Wed, 25 Jun 2014 17:51:30 +0000 (-0700)
Subject: mesa: Add and use foreach_list_typed_safe.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d6bb8bb7ce50dfec83e6be88fc21bb63315d516a;p=mesa.git

mesa: Add and use foreach_list_typed_safe.

Acked-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/glsl/list.h b/src/glsl/list.h
index 77e3aaf26e4..b7221cb7c7f 100644
--- a/src/glsl/list.h
+++ b/src/glsl/list.h
@@ -630,4 +630,13 @@ inline void exec_node::insert_before(exec_list *before)
 	(__node)->__field.next != NULL; 				\
 	(__node) = exec_node_data(__type, (__node)->__field.next, __field))
 
+#define foreach_list_typed_safe(__type, __node, __field, __list)           \
+   for (__type * __node =                                                  \
+           exec_node_data(__type, (__list)->head, __field),                \
+               * __next =                                                  \
+           exec_node_data(__type, (__node)->__field.next, __field);        \
+        __next != NULL;                                                    \
+        __node = __next, __next =                                          \
+           exec_node_data(__type, (__next)->__field.next, __field))
+
 #endif /* LIST_CONTAINER_H */
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index a45f1dd0404..07e798264a4 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -1506,9 +1506,7 @@ intel_miptree_all_slices_resolve(struct brw_context *brw,
 {
    bool did_resolve = false;
 
-   foreach_list_safe(node, &mt->hiz_map) {
-      struct intel_resolve_map *map = (struct intel_resolve_map *)node;
-
+   foreach_list_typed_safe(struct intel_resolve_map, map, link, &mt->hiz_map) {
       if (map->need != need)
 	 continue;