X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fauxiliary%2Fpipebuffer%2Fpb_bufmgr_mm.c;h=88da786216a738d8227d7b84823937016892a13b;hb=2fefbc79ac8bb55197ff817feeca2626585d7a8c;hp=fb18dcc5dcae37471e7a6608eeab6d5336ebef6e;hpb=407e8ae5b167b0193e1e5b1266a5d61ed836dfb5;p=mesa.git

diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
index fb18dcc5dca..88da786216a 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
@@ -35,7 +35,7 @@
 
 #include "pipe/p_defines.h"
 #include "util/u_debug.h"
-#include "pipe/p_thread.h"
+#include "os/os_thread.h"
 #include "util/u_memory.h"
 #include "util/u_double_list.h"
 #include "util/u_mm.h"
@@ -55,10 +55,10 @@ struct mm_pb_manager
    
    pipe_mutex mutex;
    
-   size_t size;
+   pb_size size;
    struct mem_block *heap;
    
-   size_t align2;
+   pb_size align2;
    
    struct pb_buffer *buffer;
    void *map;
@@ -97,7 +97,7 @@ mm_buffer_destroy(struct pb_buffer *buf)
    struct mm_buffer *mm_buf = mm_buffer(buf);
    struct mm_pb_manager *mm = mm_buf->mgr;
    
-   assert(p_atomic_read(&mm_buf->base.base.reference.count) == 0);
+   assert(!pipe_is_referenced(&mm_buf->base.base.reference));
    
    pipe_mutex_lock(mm->mutex);
    u_mmFreeMem(mm_buf->block);
@@ -108,11 +108,14 @@ mm_buffer_destroy(struct pb_buffer *buf)
 
 static void *
 mm_buffer_map(struct pb_buffer *buf,
-              unsigned flags)
+              unsigned flags,
+              void *flush_ctx)
 {
    struct mm_buffer *mm_buf = mm_buffer(buf);
    struct mm_pb_manager *mm = mm_buf->mgr;
 
+   /* XXX: it will be necessary to remap here to propagate flush_ctx */
+
    return (unsigned char *) mm->map + mm_buf->block->ofs;
 }
 
@@ -148,7 +151,7 @@ mm_buffer_fence(struct pb_buffer *buf,
 static void
 mm_buffer_get_base_buffer(struct pb_buffer *buf,
                           struct pb_buffer **base_buf,
-                          unsigned *offset)
+                          pb_size *offset)
 {
    struct mm_buffer *mm_buf = mm_buffer(buf);
    struct mm_pb_manager *mm = mm_buf->mgr;
@@ -170,15 +173,15 @@ mm_buffer_vtbl = {
 
 static struct pb_buffer *
 mm_bufmgr_create_buffer(struct pb_manager *mgr, 
-                        size_t size,
+                        pb_size size,
                         const struct pb_desc *desc)
 {
    struct mm_pb_manager *mm = mm_pb_manager(mgr);
    struct mm_buffer *mm_buf;
 
    /* We don't handle alignments larger then the one initially setup */
-   assert(pb_check_alignment(desc->alignment, 1 << mm->align2));
-   if(!pb_check_alignment(desc->alignment, 1 << mm->align2))
+   assert(pb_check_alignment(desc->alignment, (pb_size)1 << mm->align2));
+   if(!pb_check_alignment(desc->alignment, (pb_size)1 << mm->align2))
       return NULL;
    
    pipe_mutex_lock(mm->mutex);
@@ -198,10 +201,10 @@ mm_bufmgr_create_buffer(struct pb_manager *mgr,
    
    mm_buf->mgr = mm;
    
-   mm_buf->block = u_mmAllocMem(mm->heap, size, mm->align2, 0);
+   mm_buf->block = u_mmAllocMem(mm->heap, (int)size, (int)mm->align2, 0);
    if(!mm_buf->block) {
-      debug_printf("warning: heap full\n");
 #if 0
+      debug_printf("warning: heap full\n");
       mmDumpMemInfo(mm->heap);
 #endif
       FREE(mm_buf);
@@ -210,8 +213,8 @@ mm_bufmgr_create_buffer(struct pb_manager *mgr,
    }
    
    /* Some sanity checks */
-   assert(0 <= (unsigned)mm_buf->block->ofs && (unsigned)mm_buf->block->ofs < mm->size);
-   assert(size <= (unsigned)mm_buf->block->size && (unsigned)mm_buf->block->ofs + (unsigned)mm_buf->block->size <= mm->size);
+   assert(0 <= (pb_size)mm_buf->block->ofs && (pb_size)mm_buf->block->ofs < mm->size);
+   assert(size <= (pb_size)mm_buf->block->size && (pb_size)mm_buf->block->ofs + (pb_size)mm_buf->block->size <= mm->size);
    
    pipe_mutex_unlock(mm->mutex);
    return SUPER(mm_buf);
@@ -245,7 +248,7 @@ mm_bufmgr_destroy(struct pb_manager *mgr)
 
 struct pb_manager *
 mm_bufmgr_create_from_buffer(struct pb_buffer *buffer, 
-                             size_t size, size_t align2) 
+                             pb_size size, pb_size align2) 
 {
    struct mm_pb_manager *mm;
 
@@ -268,12 +271,12 @@ mm_bufmgr_create_from_buffer(struct pb_buffer *buffer,
    mm->buffer = buffer; 
 
    mm->map = pb_map(mm->buffer, 
-		    PIPE_BUFFER_USAGE_CPU_READ |
-		    PIPE_BUFFER_USAGE_CPU_WRITE);
+		    PB_USAGE_CPU_READ |
+		    PB_USAGE_CPU_WRITE, NULL);
    if(!mm->map)
       goto failure;
 
-   mm->heap = u_mmInit(0, size); 
+   mm->heap = u_mmInit(0, (int)size); 
    if (!mm->heap)
       goto failure;
 
@@ -292,7 +295,7 @@ if(mm->heap)
 
 struct pb_manager *
 mm_bufmgr_create(struct pb_manager *provider, 
-                 size_t size, size_t align2) 
+                 pb_size size, pb_size align2) 
 {
    struct pb_buffer *buffer;
    struct pb_manager *mgr;