gallium/util: replace pipe_condvar_destroy() with cnd_destroy()

pipe_condvar_destroy() was made unnecessary with fd33a6bcd7.

Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Timothy Arceri 2017-03-05 10:41:30 +11:00
parent 3f58242863
commit 1e0314281a
4 changed files with 9 additions and 12 deletions

View File

@ -148,9 +148,6 @@ __pipe_mutex_assert_locked(pipe_mutex *mutex)
*/
typedef cnd_t pipe_condvar;
#define pipe_condvar_destroy(cond) \
cnd_destroy(&(cond))
#define pipe_condvar_wait(cond, mutex) \
cnd_wait(&(cond), &(mutex))
@ -208,7 +205,7 @@ static inline void pipe_barrier_destroy(pipe_barrier *barrier)
{
assert(barrier->waiters == 0);
pipe_mutex_destroy(barrier->mutex);
pipe_condvar_destroy(barrier->condvar);
cnd_destroy(&barrier->condvar);
}
static inline void pipe_barrier_wait(pipe_barrier *barrier)
@ -261,7 +258,7 @@ static inline void
pipe_semaphore_destroy(pipe_semaphore *sema)
{
pipe_mutex_destroy(sema->mutex);
pipe_condvar_destroy(sema->cond);
cnd_destroy(&sema->cond);
}
/** Signal/increment semaphore counter */

View File

@ -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);

View File

@ -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);

View File

@ -73,7 +73,7 @@ lp_fence_destroy(struct lp_fence *fence)
debug_printf("%s %d\n", __FUNCTION__, fence->id);
pipe_mutex_destroy(fence->mutex);
pipe_condvar_destroy(fence->signalled);
cnd_destroy(&fence->signalled);
FREE(fence);
}