gallivm: add coroutine pass manager support

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

diff --git a/src/gallium/auxiliary/util/u_upload_mgr.c b/src/gallium/auxiliary/util/u_upload_mgr.c
index 4bb14d6218b31bf23b81ad640a0f4153e6a1d562..73f6cae0b6dddd9274d4c1e414e26d1df1cc1e94 100644 (file)
--- a/src/gallium/auxiliary/util/u_upload_mgr.c
+++ b/src/gallium/auxiliary/util/u_upload_mgr.c
@@ -44,6 +44,7 @@ struct u_upload_mgr {
    unsigned default_size;  /* Minimum size of the upload buffer, in bytes. */
    unsigned bind;          /* Bitmask of PIPE_BIND_* flags. */
    enum pipe_resource_usage usage;
+   unsigned flags;
    unsigned map_flags;     /* Bitmask of PIPE_TRANSFER_* flags. */
    boolean map_persistent; /* If persistent mappings are supported. */
 
@@ -52,12 +53,13 @@ struct u_upload_mgr {
    uint8_t *map;    /* Pointer to the mapped upload buffer. */
    unsigned offset; /* Aligned offset to the upload buffer, pointing
                      * at the first unused byte. */
+   unsigned flushed_size; /* Size we have flushed by transfer_flush_region. */
 };
 
 
 struct u_upload_mgr *
 u_upload_create(struct pipe_context *pipe, unsigned default_size,
-                unsigned bind, enum pipe_resource_usage usage)
+                unsigned bind, enum pipe_resource_usage usage, unsigned flags)
 {
    struct u_upload_mgr *upload = CALLOC_STRUCT(u_upload_mgr);
    if (!upload)
@@ -67,6 +69,7 @@ u_upload_create(struct pipe_context *pipe, unsigned default_size,
    upload->default_size = default_size;
    upload->bind = bind;
    upload->usage = usage;
+   upload->flags = flags;
 
    upload->map_persistent =
       pipe->screen->get_param(pipe->screen,
@@ -94,33 +97,63 @@ u_upload_create_default(struct pipe_context *pipe)
                           PIPE_BIND_VERTEX_BUFFER |
                           PIPE_BIND_INDEX_BUFFER |
                           PIPE_BIND_CONSTANT_BUFFER,
-                          PIPE_USAGE_STREAM);
+                          PIPE_USAGE_STREAM, 0);
 }
 
 struct u_upload_mgr *
 u_upload_clone(struct pipe_context *pipe, struct u_upload_mgr *upload)
 {
-   return u_upload_create(pipe, upload->default_size, upload->bind,
-                          upload->usage);
+   struct u_upload_mgr *result = u_upload_create(pipe, upload->default_size,
+                                                 upload->bind, upload->usage,
+                                                 upload->flags);
+   if (!upload->map_persistent && result->map_persistent)
+      u_upload_disable_persistent(result);
+   else if (upload->map_persistent &&
+            upload->map_flags & PIPE_TRANSFER_FLUSH_EXPLICIT)
+      u_upload_enable_flush_explicit(result);
+
+   return result;
+}
+
+void
+u_upload_enable_flush_explicit(struct u_upload_mgr *upload)
+{
+   assert(upload->map_persistent);
+   upload->map_flags &= ~PIPE_TRANSFER_COHERENT;
+   upload->map_flags |= PIPE_TRANSFER_FLUSH_EXPLICIT;
+}
+
+void
+u_upload_disable_persistent(struct u_upload_mgr *upload)
+{
+   upload->map_persistent = FALSE;
+   upload->map_flags &= ~(PIPE_TRANSFER_COHERENT | PIPE_TRANSFER_PERSISTENT);
+   upload->map_flags |= PIPE_TRANSFER_FLUSH_EXPLICIT;
 }
 
 static void
 upload_unmap_internal(struct u_upload_mgr *upload, boolean destroying)
 {
-   if (!destroying && upload->map_persistent)
+   if (!upload->transfer)
       return;
 
-   if (upload->transfer) {
+   if (upload->map_flags & PIPE_TRANSFER_FLUSH_EXPLICIT) {
       struct pipe_box *box = &upload->transfer->box;
+      unsigned flush_offset = box->x + upload->flushed_size;
 
-      if (!upload->map_persistent && (int) upload->offset > box->x) {
+      if (upload->offset > flush_offset) {
          pipe_buffer_flush_mapped_range(upload->pipe, upload->transfer,
-                                        box->x, upload->offset - box->x);
+                                        flush_offset,
+                                        upload->offset - flush_offset);
+         upload->flushed_size = upload->offset;
       }
+   }
 
+   if (destroying || !upload->map_persistent) {
       pipe_transfer_unmap(upload->pipe, upload->transfer);
       upload->transfer = NULL;
       upload->map = NULL;
+      upload->flushed_size = 0;
    }
 }
 
@@ -169,14 +202,15 @@ u_upload_alloc_buffer(struct u_upload_mgr *upload, unsigned min_size)
    buffer.format = PIPE_FORMAT_R8_UNORM; /* want TYPELESS or similar */
    buffer.bind = upload->bind;
    buffer.usage = upload->usage;
+   buffer.flags = upload->flags;
    buffer.width0 = size;
    buffer.height0 = 1;
    buffer.depth0 = 1;
    buffer.array_size = 1;
 
    if (upload->map_persistent) {
-      buffer.flags = PIPE_RESOURCE_FLAG_MAP_PERSISTENT |
-                     PIPE_RESOURCE_FLAG_MAP_COHERENT;
+      buffer.flags |= PIPE_RESOURCE_FLAG_MAP_PERSISTENT |
+                      PIPE_RESOURCE_FLAG_MAP_COHERENT;
    }
 
    upload->buffer = screen->resource_create(screen, &buffer);