st/dri: Use fence extension in drisw.c

[mesa.git] / src / gallium / auxiliary / util / u_ringbuffer.c

diff --git a/src/gallium/auxiliary/util/u_ringbuffer.c b/src/gallium/auxiliary/util/u_ringbuffer.c
index 19f82f52bf62d16caf93c25154c29d4ca3601288..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;
 };
 
@@ -36,7 +36,7 @@ struct util_ringbuffer *util_ringbuffer_create( unsigned dwords )
    ring->mask = dwords - 1;
 
    cnd_init(&ring->change);
-   pipe_mutex_init(ring->mutex);
+   (void) mtx_init(&ring->mutex, mtx_plain);
    return ring;
 
 fail:
@@ -48,7 +48,7 @@ fail:
 void util_ringbuffer_destroy( struct util_ringbuffer *ring )
 {
    cnd_destroy(&ring->change);
-   pipe_mutex_destroy(ring->mutex);
+   mtx_destroy(&ring->mutex);
    FREE(ring->buf);
    FREE(ring);
 }
@@ -76,7 +76,7 @@ void util_ringbuffer_enqueue( struct util_ringbuffer *ring,
 
    /* XXX: over-reliance on mutexes, etc:
     */
-   pipe_mutex_lock(ring->mutex);
+   mtx_lock(&ring->mutex);
 
    /* make sure we don't request an impossible amount of space
     */
@@ -103,7 +103,7 @@ void util_ringbuffer_enqueue( struct util_ringbuffer *ring,
    /* Signal change:
     */
    cnd_signal(&ring->change);
-   pipe_mutex_unlock(ring->mutex);
+   mtx_unlock(&ring->mutex);
 }
 
 enum pipe_error util_ringbuffer_dequeue( struct util_ringbuffer *ring,
@@ -117,7 +117,7 @@ enum pipe_error util_ringbuffer_dequeue( struct util_ringbuffer *ring,
 
    /* XXX: over-reliance on mutexes, etc:
     */
-   pipe_mutex_lock(ring->mutex);
+   mtx_lock(&ring->mutex);
 
    /* Get next ring entry:
     */
@@ -155,6 +155,6 @@ out:
    /* Signal change:
     */
    cnd_signal(&ring->change);
-   pipe_mutex_unlock(ring->mutex);
+   mtx_unlock(&ring->mutex);
    return ret;
 }