diff options
author | Timothy Arceri <[email protected]> | 2019-10-28 10:11:53 +1100 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2019-10-28 11:24:38 +0000 |
commit | c578600489e35abb481816c87124b1dc6b279655 (patch) | |
tree | 84b6a694d1bebdd4d2e6414718c5fcf0294d4bef /src/gallium/auxiliary | |
parent | c976b427c4e376d93396325a4c1ca47349f618e8 (diff) |
util: remove LIST_DEL macro
Just use the inlined function directly. The macro was replaced with
the function in ebe304fa540f.
Reviewed-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary')
-rw-r--r-- | src/gallium/auxiliary/hud/hud_context.c | 6 | ||||
-rw-r--r-- | src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c | 6 | ||||
-rw-r--r-- | src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c | 2 | ||||
-rw-r--r-- | src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c | 2 | ||||
-rw-r--r-- | src/gallium/auxiliary/pipebuffer/pb_cache.c | 4 | ||||
-rw-r--r-- | src/gallium/auxiliary/pipebuffer/pb_slab.c | 8 | ||||
-rw-r--r-- | src/gallium/auxiliary/util/u_debug_memory.c | 2 | ||||
-rw-r--r-- | src/gallium/auxiliary/util/u_threaded_context.c | 6 |
8 files changed, 18 insertions, 18 deletions
diff --git a/src/gallium/auxiliary/hud/hud_context.c b/src/gallium/auxiliary/hud/hud_context.c index 6cfee81559e..f95f07d1ab0 100644 --- a/src/gallium/auxiliary/hud/hud_context.c +++ b/src/gallium/auxiliary/hud/hud_context.c @@ -696,7 +696,7 @@ hud_stop_queries(struct hud_context *hud, struct pipe_context *pipe) */ if (gr->current_value < LIST_ENTRY(struct hud_graph, next, head)->current_value) { - LIST_DEL(&gr->head); + list_del(&gr->head); list_add(&gr->head, &next->head); } } @@ -1752,10 +1752,10 @@ hud_unset_record_context(struct hud_context *hud) LIST_FOR_EACH_ENTRY_SAFE(pane, pane_tmp, &hud->pane_list, head) { LIST_FOR_EACH_ENTRY_SAFE(graph, graph_tmp, &pane->graph_list, head) { - LIST_DEL(&graph->head); + list_del(&graph->head); hud_graph_destroy(graph, pipe); } - LIST_DEL(&pane->head); + list_del(&pane->head); FREE(pane); } diff --git a/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c index b8b53fd8275..cae87520020 100644 --- a/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c +++ b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c @@ -250,7 +250,7 @@ fenced_buffer_destroy_locked(struct fenced_manager *fenced_mgr, assert(!fenced_buf->fence); assert(fenced_buf->head.prev); assert(fenced_buf->head.next); - LIST_DEL(&fenced_buf->head); + list_del(&fenced_buf->head); assert(fenced_mgr->num_unfenced); --fenced_mgr->num_unfenced; @@ -276,7 +276,7 @@ fenced_buffer_add_locked(struct fenced_manager *fenced_mgr, p_atomic_inc(&fenced_buf->base.reference.count); - LIST_DEL(&fenced_buf->head); + list_del(&fenced_buf->head); assert(fenced_mgr->num_unfenced); --fenced_mgr->num_unfenced; list_addtail(&fenced_buf->head, &fenced_mgr->fenced); @@ -305,7 +305,7 @@ fenced_buffer_remove_locked(struct fenced_manager *fenced_mgr, assert(fenced_buf->head.prev); assert(fenced_buf->head.next); - LIST_DEL(&fenced_buf->head); + list_del(&fenced_buf->head); assert(fenced_mgr->num_fenced); --fenced_mgr->num_fenced; diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c index a5d211bc6d4..8cedc42b916 100644 --- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c +++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c @@ -236,7 +236,7 @@ pb_debug_buffer_destroy(struct pb_buffer *_buf) pb_debug_buffer_check(buf); mtx_lock(&mgr->mutex); - LIST_DEL(&buf->head); + list_del(&buf->head); mtx_unlock(&mgr->mutex); mtx_destroy(&buf->mutex); diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c index 03035497cfc..dd59733fe9b 100644 --- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c +++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c @@ -204,7 +204,7 @@ pb_slab_buffer_destroy(struct pb_buffer *_buf) buf->mapCount = 0; - LIST_DEL(list); + list_del(list); list_addtail(list, &slab->freeBuffers); slab->numFree++; diff --git a/src/gallium/auxiliary/pipebuffer/pb_cache.c b/src/gallium/auxiliary/pipebuffer/pb_cache.c index cc1b1fbed00..ec878202f08 100644 --- a/src/gallium/auxiliary/pipebuffer/pb_cache.c +++ b/src/gallium/auxiliary/pipebuffer/pb_cache.c @@ -42,7 +42,7 @@ destroy_buffer_locked(struct pb_cache_entry *entry) assert(!pipe_is_referenced(&buf->reference)); if (entry->head.next) { - LIST_DEL(&entry->head); + list_del(&entry->head); assert(mgr->num_buffers); --mgr->num_buffers; mgr->cache_size -= buf->size; @@ -208,7 +208,7 @@ pb_cache_reclaim_buffer(struct pb_cache *mgr, pb_size size, struct pb_buffer *buf = entry->buffer; mgr->cache_size -= buf->size; - LIST_DEL(&entry->head); + list_del(&entry->head); --mgr->num_buffers; mtx_unlock(&mgr->mutex); /* Increase refcount */ diff --git a/src/gallium/auxiliary/pipebuffer/pb_slab.c b/src/gallium/auxiliary/pipebuffer/pb_slab.c index 3ae24cf5405..844bf3535f6 100644 --- a/src/gallium/auxiliary/pipebuffer/pb_slab.c +++ b/src/gallium/auxiliary/pipebuffer/pb_slab.c @@ -55,7 +55,7 @@ pb_slab_reclaim(struct pb_slabs *slabs, struct pb_slab_entry *entry) { struct pb_slab *slab = entry->slab; - LIST_DEL(&entry->head); /* remove from reclaim list */ + list_del(&entry->head); /* remove from reclaim list */ list_add(&entry->head, &slab->free); slab->num_free++; @@ -66,7 +66,7 @@ pb_slab_reclaim(struct pb_slabs *slabs, struct pb_slab_entry *entry) } if (slab->num_free >= slab->num_entries) { - LIST_DEL(&slab->head); + list_del(&slab->head); slabs->slab_free(slabs->priv, slab); } } @@ -124,7 +124,7 @@ pb_slab_alloc(struct pb_slabs *slabs, unsigned size, unsigned heap) if (!LIST_IS_EMPTY(&slab->free)) break; - LIST_DEL(&slab->head); + list_del(&slab->head); } if (LIST_IS_EMPTY(&group->slabs)) { @@ -145,7 +145,7 @@ pb_slab_alloc(struct pb_slabs *slabs, unsigned size, unsigned heap) } entry = LIST_ENTRY(struct pb_slab_entry, slab->free.next, head); - LIST_DEL(&entry->head); + list_del(&entry->head); slab->num_free--; mtx_unlock(&slabs->mutex); diff --git a/src/gallium/auxiliary/util/u_debug_memory.c b/src/gallium/auxiliary/util/u_debug_memory.c index 70f51144fa9..e468fd0b252 100644 --- a/src/gallium/auxiliary/util/u_debug_memory.c +++ b/src/gallium/auxiliary/util/u_debug_memory.c @@ -200,7 +200,7 @@ debug_free(const char *file, unsigned line, const char *function, memset(ptr, DEBUG_FREED_BYTE, hdr->size); #else mtx_lock(&list_mutex); - LIST_DEL(&hdr->head); + list_del(&hdr->head); mtx_unlock(&list_mutex); hdr->magic = 0; ftr->magic = 0; diff --git a/src/gallium/auxiliary/util/u_threaded_context.c b/src/gallium/auxiliary/util/u_threaded_context.c index a7885b6b591..086700c88bf 100644 --- a/src/gallium/auxiliary/util/u_threaded_context.c +++ b/src/gallium/auxiliary/util/u_threaded_context.c @@ -352,7 +352,7 @@ tc_call_destroy_query(struct pipe_context *pipe, union tc_payload *payload) struct threaded_query *tq = threaded_query(payload->query); if (tq->head_unflushed.next) - LIST_DEL(&tq->head_unflushed); + list_del(&tq->head_unflushed); pipe->destroy_query(pipe, payload->query); } @@ -432,7 +432,7 @@ tc_get_query_result(struct pipe_context *_pipe, tq->flushed = true; if (tq->head_unflushed.next) { /* This is safe because it can only happen after we sync'd. */ - LIST_DEL(&tq->head_unflushed); + list_del(&tq->head_unflushed); } } return success; @@ -1965,7 +1965,7 @@ tc_flush_queries(struct threaded_context *tc) { struct threaded_query *tq, *tmp; LIST_FOR_EACH_ENTRY_SAFE(tq, tmp, &tc->unflushed_queries, head_unflushed) { - LIST_DEL(&tq->head_unflushed); + list_del(&tq->head_unflushed); /* Memory release semantics: due to a possible race with * tc_get_query_result, we must ensure that the linked list changes |