diff options
author | Timothy Arceri <[email protected]> | 2017-03-05 12:32:01 +1100 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2017-03-07 08:48:11 +1100 |
commit | 2efddc63ee864ab917e444b68a7c2dcf520d451e (patch) | |
tree | c5b3e14ccdf933775310fe593f6c14baf2b88f7b /src/gallium/auxiliary/util | |
parent | 464d4806c112c6d224a55b328cde327a025acd91 (diff) |
gallium/util: replace pipe_mutex with mtx_t
pipe_mutex was made unnecessary with fd33a6bcd7f12.
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary/util')
-rw-r--r-- | src/gallium/auxiliary/util/u_debug_flush.c | 2 | ||||
-rw-r--r-- | src/gallium/auxiliary/util/u_queue.h | 4 | ||||
-rw-r--r-- | src/gallium/auxiliary/util/u_range.h | 2 | ||||
-rw-r--r-- | src/gallium/auxiliary/util/u_ringbuffer.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/auxiliary/util/u_debug_flush.c b/src/gallium/auxiliary/util/u_debug_flush.c index 52e72cd6d88..6a8a91d3130 100644 --- a/src/gallium/auxiliary/util/u_debug_flush.c +++ b/src/gallium/auxiliary/util/u_debug_flush.c @@ -53,7 +53,7 @@ struct debug_flush_buf { /* Atomic */ struct pipe_reference reference; /* Must be the first member. */ - pipe_mutex mutex; + mtx_t mutex; /* Immutable */ boolean supports_unsync; unsigned bt_depth; diff --git a/src/gallium/auxiliary/util/u_queue.h b/src/gallium/auxiliary/util/u_queue.h index 2e0a5a36e26..8d4804f5c6a 100644 --- a/src/gallium/auxiliary/util/u_queue.h +++ b/src/gallium/auxiliary/util/u_queue.h @@ -40,7 +40,7 @@ * Put this into your job structure. */ struct util_queue_fence { - pipe_mutex mutex; + mtx_t mutex; pipe_condvar cond; int signalled; }; @@ -57,7 +57,7 @@ struct util_queue_job { /* Put this into your context. */ struct util_queue { const char *name; - pipe_mutex lock; + mtx_t lock; pipe_condvar has_queued_cond; pipe_condvar has_space_cond; pipe_thread *threads; diff --git a/src/gallium/auxiliary/util/u_range.h b/src/gallium/auxiliary/util/u_range.h index a1da5e5a6f0..9055d7b6007 100644 --- a/src/gallium/auxiliary/util/u_range.h +++ b/src/gallium/auxiliary/util/u_range.h @@ -43,7 +43,7 @@ struct util_range { unsigned end; /* exclusive */ /* for the range to be consistent with multiple contexts: */ - pipe_mutex write_mutex; + mtx_t write_mutex; }; diff --git a/src/gallium/auxiliary/util/u_ringbuffer.c b/src/gallium/auxiliary/util/u_ringbuffer.c index a97236fe54c..19f82f52bf6 100644 --- a/src/gallium/auxiliary/util/u_ringbuffer.c +++ b/src/gallium/auxiliary/util/u_ringbuffer.c @@ -17,7 +17,7 @@ struct util_ringbuffer unsigned head; unsigned tail; pipe_condvar change; - pipe_mutex mutex; + mtx_t mutex; }; |