summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/auxiliary/os/os_thread.h5
-rw-r--r--src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c2
-rw-r--r--src/gallium/auxiliary/util/u_queue.c4
-rw-r--r--src/gallium/drivers/llvmpipe/lp_fence.c2
-rw-r--r--src/gallium/drivers/rbug/rbug_core.c6
5 files changed, 8 insertions, 11 deletions
diff --git a/src/gallium/auxiliary/os/os_thread.h b/src/gallium/auxiliary/os/os_thread.h
index a8b5d926342..6eca2ca2c7a 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_broadcast(cond) \
- cnd_broadcast(&(cond))
-
/*
* pipe_barrier
@@ -218,7 +215,7 @@ static inline void pipe_barrier_wait(pipe_barrier *barrier)
} else {
barrier->waiters = 0;
barrier->sequence++;
- pipe_condvar_broadcast(barrier->condvar);
+ cnd_broadcast(&barrier->condvar);
}
pipe_mutex_unlock(barrier->mutex);
diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
index 541a6d9079a..cc42eeae564 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
@@ -246,7 +246,7 @@ pb_slab_buffer_unmap(struct pb_buffer *_buf)
--buf->mapCount;
if (buf->mapCount == 0)
- pipe_condvar_broadcast(buf->event);
+ cnd_broadcast(&buf->event);
}
diff --git a/src/gallium/auxiliary/util/u_queue.c b/src/gallium/auxiliary/util/u_queue.c
index 3cef7d200ba..c84e0ad6840 100644
--- a/src/gallium/auxiliary/util/u_queue.c
+++ b/src/gallium/auxiliary/util/u_queue.c
@@ -96,7 +96,7 @@ util_queue_fence_signal(struct util_queue_fence *fence)
{
pipe_mutex_lock(fence->mutex);
fence->signalled = true;
- pipe_condvar_broadcast(fence->cond);
+ cnd_broadcast(&fence->cond);
pipe_mutex_unlock(fence->mutex);
}
@@ -267,7 +267,7 @@ util_queue_killall_and_wait(struct util_queue *queue)
/* Signal all threads to terminate. */
pipe_mutex_lock(queue->lock);
queue->kill_threads = 1;
- pipe_condvar_broadcast(queue->has_queued_cond);
+ cnd_broadcast(&queue->has_queued_cond);
pipe_mutex_unlock(queue->lock);
for (i = 0; i < queue->num_threads; i++)
diff --git a/src/gallium/drivers/llvmpipe/lp_fence.c b/src/gallium/drivers/llvmpipe/lp_fence.c
index 1a8e365f004..115589f8705 100644
--- a/src/gallium/drivers/llvmpipe/lp_fence.c
+++ b/src/gallium/drivers/llvmpipe/lp_fence.c
@@ -99,7 +99,7 @@ lp_fence_signal(struct lp_fence *fence)
/* Wakeup all threads waiting on the mutex:
*/
- pipe_condvar_broadcast(fence->signalled);
+ cnd_broadcast(&fence->signalled);
pipe_mutex_unlock(fence->mutex);
}
diff --git a/src/gallium/drivers/rbug/rbug_core.c b/src/gallium/drivers/rbug/rbug_core.c
index dedbc14e8d8..3bb781b57bf 100644
--- a/src/gallium/drivers/rbug/rbug_core.c
+++ b/src/gallium/drivers/rbug/rbug_core.c
@@ -409,7 +409,7 @@ rbug_context_draw_step(struct rbug_rbug *tr_rbug, struct rbug_header *header, ui
}
pipe_mutex_unlock(rb_context->draw_mutex);
- pipe_condvar_broadcast(rb_context->draw_cond);
+ cnd_broadcast(&rb_context->draw_cond);
pipe_mutex_unlock(rb_screen->list_mutex);
@@ -442,7 +442,7 @@ rbug_context_draw_unblock(struct rbug_rbug *tr_rbug, struct rbug_header *header,
rb_context->draw_blocker &= ~unblock->unblock;
pipe_mutex_unlock(rb_context->draw_mutex);
- pipe_condvar_broadcast(rb_context->draw_cond);
+ cnd_broadcast(&rb_context->draw_cond);
pipe_mutex_unlock(rb_screen->list_mutex);
@@ -474,7 +474,7 @@ rbug_context_draw_rule(struct rbug_rbug *tr_rbug, struct rbug_header *header, ui
rb_context->draw_blocker |= RBUG_BLOCK_RULE;
pipe_mutex_unlock(rb_context->draw_mutex);
- pipe_condvar_broadcast(rb_context->draw_cond);
+ cnd_broadcast(&rb_context->draw_cond);
pipe_mutex_unlock(rb_screen->list_mutex);