X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fauxiliary%2Fpipebuffer%2Fpb_bufmgr_slab.c;h=d21910d0bf06c6d900c97ec76bb2303a6beafa17;hb=9eb7fc6661a1d46c06cec8584b898e3e690af6fa;hp=2a801549202309aa79666a070456b0eb139666ea;hpb=62dd7575f07f3ff9803118113746dba9219c1390;p=mesa.git

diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
index 2a801549202..d21910d0bf0 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
@@ -37,8 +37,7 @@
  */
 
 #include "pipe/p_compiler.h"
-#include "pipe/p_error.h"
-#include "pipe/p_debug.h"
+#include "util/u_debug.h"
 #include "pipe/p_thread.h"
 #include "pipe/p_defines.h"
 #include "util/u_memory.h"
@@ -68,7 +67,7 @@ struct pb_slab_buffer
    unsigned mapCount;
    
    /** Offset relative to the start of the slab buffer. */
-   size_t start;
+   pb_size start;
    
    /** Use when validating, to signal that all mappings are finished */
    /* TODO: Actually validation does not reach this stage yet */
@@ -83,8 +82,8 @@ struct pb_slab
 {
    struct list_head head;
    struct list_head freeBuffers;
-   size_t numBuffers;
-   size_t numFree;
+   pb_size numBuffers;
+   pb_size numFree;
    
    struct pb_slab_buffer *buffers;
    struct pb_slab_manager *mgr;
@@ -108,10 +107,10 @@ struct pb_slab_manager
    struct pb_manager *provider;
    
    /** Size of the buffers we hand on downstream */
-   size_t bufSize;
+   pb_size bufSize;
    
    /** Size of the buffers we request upstream */
-   size_t slabSize;
+   pb_size slabSize;
    
    /** 
     * Alignment, usage to be used to allocate the slab buffers.
@@ -150,14 +149,14 @@ struct pb_slab_range_manager
 
    struct pb_manager *provider;
    
-   size_t minBufSize;
-   size_t maxBufSize;
+   pb_size minBufSize;
+   pb_size maxBufSize;
    
    /** @sa pb_slab_manager::desc */ 
    struct pb_desc desc;
    
    unsigned numBuckets;
-   size_t *bucketSizes;
+   pb_size *bucketSizes;
    
    /** Array of pb_slab_manager, one for each bucket size */
    struct pb_manager **buckets;
@@ -202,7 +201,7 @@ pb_slab_buffer_destroy(struct pb_buffer *_buf)
 
    pipe_mutex_lock(mgr->mutex);
    
-   assert(buf->base.base.refcount == 0);
+   assert(!pipe_is_referenced(&buf->base.base.reference));
    
    buf->mapCount = 0;
 
@@ -248,10 +247,29 @@ pb_slab_buffer_unmap(struct pb_buffer *_buf)
 }
 
 
+static enum pipe_error 
+pb_slab_buffer_validate(struct pb_buffer *_buf, 
+                         struct pb_validate *vl,
+                         unsigned flags)
+{
+   struct pb_slab_buffer *buf = pb_slab_buffer(_buf);
+   return pb_validate(buf->slab->bo, vl, flags);
+}
+
+
+static void
+pb_slab_buffer_fence(struct pb_buffer *_buf, 
+                      struct pipe_fence_handle *fence)
+{
+   struct pb_slab_buffer *buf = pb_slab_buffer(_buf);
+   pb_fence(buf->slab->bo, fence);
+}
+
+
 static void
 pb_slab_buffer_get_base_buffer(struct pb_buffer *_buf,
                                struct pb_buffer **base_buf,
-                               unsigned *offset)
+                               pb_size *offset)
 {
    struct pb_slab_buffer *buf = pb_slab_buffer(_buf);
    pb_get_base_buffer(buf->slab->bo, base_buf, offset);
@@ -264,6 +282,8 @@ pb_slab_buffer_vtbl = {
       pb_slab_buffer_destroy,
       pb_slab_buffer_map,
       pb_slab_buffer_unmap,
+      pb_slab_buffer_validate,
+      pb_slab_buffer_fence,
       pb_slab_buffer_get_base_buffer
 };
 
@@ -319,7 +339,7 @@ pb_slab_create(struct pb_slab_manager *mgr)
 
    buf = slab->buffers;
    for (i=0; i < numBuffers; ++i) {
-      buf->base.base.refcount = 0;
+      pipe_reference_init(&buf->base.base.reference, 0);
       buf->base.base.size = mgr->bufSize;
       buf->base.base.alignment = 0;
       buf->base.base.usage = 0;
@@ -348,7 +368,7 @@ out_err0:
 
 static struct pb_buffer *
 pb_slab_manager_create_buffer(struct pb_manager *_mgr,
-                              size_t size,
+                              pb_size size,
                               const struct pb_desc *desc)
 {
    struct pb_slab_manager *mgr = pb_slab_manager(_mgr);
@@ -398,7 +418,7 @@ pb_slab_manager_create_buffer(struct pb_manager *_mgr,
    pipe_mutex_unlock(mgr->mutex);
    buf = LIST_ENTRY(struct pb_slab_buffer, list, head);
    
-   ++buf->base.base.refcount;
+   pipe_reference_init(&buf->base.base.reference, 1);
    buf->base.base.alignment = desc->alignment;
    buf->base.base.usage = desc->usage;
    
@@ -429,8 +449,8 @@ pb_slab_manager_destroy(struct pb_manager *_mgr)
 
 struct pb_manager *
 pb_slab_manager_create(struct pb_manager *provider,
-                       size_t bufSize,
-                       size_t slabSize,
+                       pb_size bufSize,
+                       pb_size slabSize,
                        const struct pb_desc *desc)
 {
    struct pb_slab_manager *mgr;
@@ -458,11 +478,11 @@ pb_slab_manager_create(struct pb_manager *provider,
 
 static struct pb_buffer *
 pb_slab_range_manager_create_buffer(struct pb_manager *_mgr,
-                                    size_t size,
+                                    pb_size size,
                                     const struct pb_desc *desc)
 {
    struct pb_slab_range_manager *mgr = pb_slab_range_manager(_mgr);
-   size_t bufSize;
+   pb_size bufSize;
    unsigned i;
 
    bufSize = mgr->minBufSize;
@@ -506,13 +526,13 @@ pb_slab_range_manager_destroy(struct pb_manager *_mgr)
 
 struct pb_manager *
 pb_slab_range_manager_create(struct pb_manager *provider,
-                             size_t minBufSize,
-                             size_t maxBufSize,
-                             size_t slabSize,
+                             pb_size minBufSize,
+                             pb_size maxBufSize,
+                             pb_size slabSize,
                              const struct pb_desc *desc)
 {
    struct pb_slab_range_manager *mgr;
-   size_t bufSize;
+   pb_size bufSize;
    unsigned i;
 
    if(!provider)