diff options
author | Timothy Arceri <[email protected]> | 2017-03-05 10:41:31 +1100 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2017-03-07 08:23:26 +1100 |
commit | 74c879ac75d5e9262b668c8c6fdaa5d36e3c3bf3 (patch) | |
tree | 4600fd1eef8b5d964cfea8b10ba97286d6e0b292 /src/gallium/auxiliary/os | |
parent | 1e0314281a7d2e57b0e0ad2296445dffdb26dbd2 (diff) |
gallium/util: replace pipe_condvar_wait() with cnd_wait()
pipe_condvar_wait() was made unnecessary with fd33a6bcd7f12.
Reviewed-by: Emil Velikov <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary/os')
-rw-r--r-- | src/gallium/auxiliary/os/os_thread.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/gallium/auxiliary/os/os_thread.h b/src/gallium/auxiliary/os/os_thread.h index e230d06149e..6895f4e97f4 100644 --- a/src/gallium/auxiliary/os/os_thread.h +++ b/src/gallium/auxiliary/os/os_thread.h @@ -148,9 +148,6 @@ __pipe_mutex_assert_locked(pipe_mutex *mutex) */ typedef cnd_t pipe_condvar; -#define pipe_condvar_wait(cond, mutex) \ - cnd_wait(&(cond), &(mutex)) - #define pipe_condvar_signal(cond) \ cnd_signal(&(cond)) @@ -219,7 +216,7 @@ static inline void pipe_barrier_wait(pipe_barrier *barrier) uint64_t sequence = barrier->sequence; do { - pipe_condvar_wait(barrier->condvar, barrier->mutex); + cnd_wait(&barrier->condvar, &barrier->mutex); } while (sequence == barrier->sequence); } else { barrier->waiters = 0; @@ -277,7 +274,7 @@ pipe_semaphore_wait(pipe_semaphore *sema) { pipe_mutex_lock(sema->mutex); while (sema->counter <= 0) { - pipe_condvar_wait(sema->cond, sema->mutex); + cnd_wait(&sema->cond, &sema->mutex); } sema->counter--; pipe_mutex_unlock(sema->mutex); |