gallium/util: replace pipe_condvar with cnd_t

pipe_condvar was made unnecessary with fd33a6bcd7f12.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/gallium/auxiliary/os/os_thread.h b/src/gallium/auxiliary/os/os_thread.h
index ad2cda431d17bef09f25ec9a8b2859ce42075523..b15dd053c3d680208daf2b54cd6e535656b10ab7 100644 (file)
--- a/src/gallium/auxiliary/os/os_thread.h
+++ b/src/gallium/auxiliary/os/os_thread.h
@@ -121,10 +121,6 @@ __pipe_mutex_assert_locked(mtx_t *mutex)
 #endif
 }
 
-/* pipe_condvar
- */
-typedef cnd_t pipe_condvar;
-
 
 /*
  * pipe_barrier
@@ -157,7 +153,7 @@ typedef struct {
    unsigned waiters;
    uint64_t sequence;
    mtx_t mutex;
-   pipe_condvar condvar;
+   cnd_t condvar;
 } pipe_barrier;
 
 static inline void pipe_barrier_init(pipe_barrier *barrier, unsigned count)
@@ -209,7 +205,7 @@ static inline void pipe_barrier_wait(pipe_barrier *barrier)
 typedef struct
 {
    mtx_t mutex;
-   pipe_condvar cond;
+   cnd_t cond;
    int counter;
 } pipe_semaphore;
 

diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
index a89236ed7c132e0bdfed4d08895ac2f9ac757112..96c0683a1bd545c23352a55126d4ebacd0b37d8d 100644 (file)
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
@@ -71,7 +71,7 @@ struct pb_slab_buffer
    
    /** Use when validating, to signal that all mappings are finished */
    /* TODO: Actually validation does not reach this stage yet */
-   pipe_condvar event;
+   cnd_t event;
 };
 
 

diff --git a/src/gallium/auxiliary/util/u_queue.h b/src/gallium/auxiliary/util/u_queue.h
index 635545f3a658c58df41e1416af9a93cd765402e9..d62d87d14d7881dd8c68e69efc6f2d0375a91b79 100644 (file)
--- a/src/gallium/auxiliary/util/u_queue.h
+++ b/src/gallium/auxiliary/util/u_queue.h
@@ -41,7 +41,7 @@
  */
 struct util_queue_fence {
    mtx_t mutex;
-   pipe_condvar cond;
+   cnd_t cond;
    int signalled;
 };
 
@@ -58,8 +58,8 @@ struct util_queue_job {
 struct util_queue {
    const char *name;
    mtx_t lock;
-   pipe_condvar has_queued_cond;
-   pipe_condvar has_space_cond;
+   cnd_t has_queued_cond;
+   cnd_t has_space_cond;
    thrd_t *threads;
    int num_queued;
    unsigned num_threads;

diff --git a/src/gallium/auxiliary/util/u_ringbuffer.c b/src/gallium/auxiliary/util/u_ringbuffer.c
index fd51f26642588dfc5b5616c0558353c4cd480fcb..4d6166833e4f60b397270268b4150ffb12277e8d 100644 (file)
--- a/src/gallium/auxiliary/util/u_ringbuffer.c
+++ b/src/gallium/auxiliary/util/u_ringbuffer.c
@@ -16,7 +16,7 @@ struct util_ringbuffer
     */
    unsigned head;
    unsigned tail;
-   pipe_condvar change;
+   cnd_t change;
    mtx_t mutex;
 };
 

diff --git a/src/gallium/drivers/llvmpipe/lp_fence.h b/src/gallium/drivers/llvmpipe/lp_fence.h
index 4fc0801a6f0797cf85d5dd6cffb88d1055063461..b72026492c6a8fdf9a4d6297c2040a5c6b41f830 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_fence.h
+++ b/src/gallium/drivers/llvmpipe/lp_fence.h
@@ -44,7 +44,7 @@ struct lp_fence
    unsigned id;
 
    mtx_t mutex;
-   pipe_condvar signalled;
+   cnd_t signalled;
 
    boolean issued;
    unsigned rank;

diff --git a/src/gallium/drivers/rbug/rbug_context.h b/src/gallium/drivers/rbug/rbug_context.h
index 6f11fa46b5d43f5abcd67799c31de8b579f0adb8..e89c6eaac010a61261edb2883ea9e056e3fcce20 100644 (file)
--- a/src/gallium/drivers/rbug/rbug_context.h
+++ b/src/gallium/drivers/rbug/rbug_context.h
@@ -59,7 +59,7 @@ struct rbug_context {
 
    /* draw locking */
    mtx_t draw_mutex;
-   pipe_condvar draw_cond;
+   cnd_t draw_cond;
    unsigned draw_num_rules;
    int draw_blocker;
    int draw_blocked;

diff --git a/src/gallium/state_trackers/nine/nine_queue.c b/src/gallium/state_trackers/nine/nine_queue.c
index 2a65a1e13ba9b78c4cdf40bd5c6cf6ce22ecc668..7a85798f0f4109c85fed9e0bcfb5751f39bfefe1 100644 (file)
--- a/src/gallium/state_trackers/nine/nine_queue.c
+++ b/src/gallium/state_trackers/nine/nine_queue.c
@@ -72,8 +72,8 @@ struct nine_queue_pool {
     unsigned tail;
     unsigned cur_instr;
     BOOL worker_wait;
-    pipe_condvar event_pop;
-    pipe_condvar event_push;
+    cnd_t event_pop;
+    cnd_t event_push;
     mtx_t mutex_pop;
     mtx_t mutex_push;
 };

diff --git a/src/gallium/state_trackers/nine/nine_state.c b/src/gallium/state_trackers/nine/nine_state.c
index bfceeeefeac0d772e5e609252fb5f5de28b03f43..e6d215ac742b22b56ef6678c87dd952c1b9ca41e 100644 (file)
--- a/src/gallium/state_trackers/nine/nine_state.c
+++ b/src/gallium/state_trackers/nine/nine_state.c
@@ -63,7 +63,7 @@ struct csmt_context {
     thrd_t worker;
     struct nine_queue_pool* pool;
     BOOL terminate;
-    pipe_condvar event_processed;
+    cnd_t event_processed;
     mtx_t mutex_processed;
     struct NineDevice9 *device;
     BOOL processed;