aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary/util
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2017-03-05 10:41:30 +1100
committerTimothy Arceri <[email protected]>2017-03-07 08:23:26 +1100
commit1e0314281a7d2e57b0e0ad2296445dffdb26dbd2 (patch)
tree0e1a168ebef856a103768e8ebcb101f7631ad998 /src/gallium/auxiliary/util
parent3f58242863e03c47e3b37a63c84a965d12047612 (diff)
gallium/util: replace pipe_condvar_destroy() with cnd_destroy()
pipe_condvar_destroy() was made unnecessary with fd33a6bcd7f12. Reviewed-by: Emil Velikov <[email protected]> Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary/util')
-rw-r--r--src/gallium/auxiliary/util/u_queue.c10
-rw-r--r--src/gallium/auxiliary/util/u_ringbuffer.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/auxiliary/util/u_queue.c b/src/gallium/auxiliary/util/u_queue.c
index dff5b154cac..87f0120d888 100644
--- a/src/gallium/auxiliary/util/u_queue.c
+++ b/src/gallium/auxiliary/util/u_queue.c
@@ -122,7 +122,7 @@ void
util_queue_fence_destroy(struct util_queue_fence *fence)
{
assert(fence->signalled);
- pipe_condvar_destroy(fence->cond);
+ cnd_destroy(&fence->cond);
pipe_mutex_destroy(fence->mutex);
}
@@ -249,8 +249,8 @@ fail:
FREE(queue->threads);
if (queue->jobs) {
- pipe_condvar_destroy(queue->has_space_cond);
- pipe_condvar_destroy(queue->has_queued_cond);
+ cnd_destroy(&queue->has_space_cond);
+ cnd_destroy(&queue->has_queued_cond);
pipe_mutex_destroy(queue->lock);
FREE(queue->jobs);
}
@@ -281,8 +281,8 @@ util_queue_destroy(struct util_queue *queue)
util_queue_killall_and_wait(queue);
remove_from_atexit_list(queue);
- pipe_condvar_destroy(queue->has_space_cond);
- pipe_condvar_destroy(queue->has_queued_cond);
+ cnd_destroy(&queue->has_space_cond);
+ cnd_destroy(&queue->has_queued_cond);
pipe_mutex_destroy(queue->lock);
FREE(queue->jobs);
FREE(queue->threads);
diff --git a/src/gallium/auxiliary/util/u_ringbuffer.c b/src/gallium/auxiliary/util/u_ringbuffer.c
index e3be3ef1fba..334be6a1d47 100644
--- a/src/gallium/auxiliary/util/u_ringbuffer.c
+++ b/src/gallium/auxiliary/util/u_ringbuffer.c
@@ -47,7 +47,7 @@ fail:
void util_ringbuffer_destroy( struct util_ringbuffer *ring )
{
- pipe_condvar_destroy(ring->change);
+ cnd_destroy(&ring->change);
pipe_mutex_destroy(ring->mutex);
FREE(ring->buf);
FREE(ring);