From 3f58242863e03c47e3b37a63c84a965d12047612 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Sun, 5 Mar 2017 10:41:29 +1100 Subject: gallium/util: replace pipe_condvar_init() with cnd_init() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pipe_condvar_init() was made unnecessary with fd33a6bcd7f12. Reviewed-by: Emil Velikov Reviewed-by: Marek Olšák --- src/gallium/auxiliary/util/u_queue.c | 6 +++--- src/gallium/auxiliary/util/u_ringbuffer.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gallium/auxiliary/util') diff --git a/src/gallium/auxiliary/util/u_queue.c b/src/gallium/auxiliary/util/u_queue.c index 8dd4cb3ccbb..dff5b154cac 100644 --- a/src/gallium/auxiliary/util/u_queue.c +++ b/src/gallium/auxiliary/util/u_queue.c @@ -114,7 +114,7 @@ util_queue_fence_init(struct util_queue_fence *fence) { memset(fence, 0, sizeof(*fence)); pipe_mutex_init(fence->mutex); - pipe_condvar_init(fence->cond); + cnd_init(&fence->cond); fence->signalled = true; } @@ -213,8 +213,8 @@ util_queue_init(struct util_queue *queue, pipe_mutex_init(queue->lock); queue->num_queued = 0; - pipe_condvar_init(queue->has_queued_cond); - pipe_condvar_init(queue->has_space_cond); + cnd_init(&queue->has_queued_cond); + cnd_init(&queue->has_space_cond); queue->threads = (pipe_thread*)CALLOC(num_threads, sizeof(pipe_thread)); if (!queue->threads) diff --git a/src/gallium/auxiliary/util/u_ringbuffer.c b/src/gallium/auxiliary/util/u_ringbuffer.c index 19830a904e6..e3be3ef1fba 100644 --- a/src/gallium/auxiliary/util/u_ringbuffer.c +++ b/src/gallium/auxiliary/util/u_ringbuffer.c @@ -35,7 +35,7 @@ struct util_ringbuffer *util_ringbuffer_create( unsigned dwords ) ring->mask = dwords - 1; - pipe_condvar_init(ring->change); + cnd_init(&ring->change); pipe_mutex_init(ring->mutex); return ring; -- cgit v1.2.3