r300: Don't disable destination read if the src blend factor needs it

[mesa.git] / src / gallium / drivers / r300 / r300_screen_buffer.c

diff --git a/src/gallium/drivers/r300/r300_screen_buffer.c b/src/gallium/drivers/r300/r300_screen_buffer.c
index 37a7c77010ab9bea703f31c4f917390a0d9d0639..c92ec56507c2f679b7951ce59a4eeaa3d4c22652 100644 (file)
--- a/src/gallium/drivers/r300/r300_screen_buffer.c
+++ b/src/gallium/drivers/r300/r300_screen_buffer.c
@@ -55,7 +55,7 @@ static void r300_buffer_destroy(struct pipe_screen *screen,
 {
     struct r300_resource *rbuf = r300_resource(buf);
 
-    FREE(rbuf->malloced_buffer);
+    align_free(rbuf->malloced_buffer);
 
     if (rbuf->buf)
         pb_reference(&rbuf->buf, NULL);
@@ -84,11 +84,41 @@ r300_buffer_transfer_map( struct pipe_context *context,
     transfer->box = *box;
     transfer->stride = 0;
     transfer->layer_stride = 0;
-    transfer->data = NULL;
 
     if (rbuf->malloced_buffer) {
         *ptransfer = transfer;
-        return (uint8_t *) rbuf->malloced_buffer + box->x;
+        return rbuf->malloced_buffer + box->x;
+    }
+
+    if (usage & PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE &&
+        !(usage & PIPE_TRANSFER_UNSYNCHRONIZED)) {
+        assert(usage & PIPE_TRANSFER_WRITE);
+
+        /* Check if mapping this buffer would cause waiting for the GPU. */
+        if (r300->rws->cs_is_buffer_referenced(r300->cs, rbuf->cs_buf, RADEON_USAGE_READWRITE) ||
+            r300->rws->buffer_is_busy(rbuf->buf, RADEON_USAGE_READWRITE)) {
+            unsigned i;
+            struct pb_buffer *new_buf;
+
+            /* Create a new one in the same pipe_resource. */
+            new_buf = r300->rws->buffer_create(r300->rws,
+                                               rbuf->b.b.width0, R300_BUFFER_ALIGNMENT,
+                                               rbuf->b.b.bind, rbuf->domain);
+            if (new_buf) {
+                /* Discard the old buffer. */
+                pb_reference(&rbuf->buf, NULL);
+                rbuf->buf = new_buf;
+                rbuf->cs_buf = r300->rws->buffer_get_cs_handle(rbuf->buf);
+
+                /* We changed the buffer, now we need to bind it where the old one was bound. */
+                for (i = 0; i < r300->nr_vertex_buffers; i++) {
+                    if (r300->vertex_buffer[i].buffer == &rbuf->b.b) {
+                        r300->vertex_arrays_dirty = TRUE;
+                        break;
+                    }
+                }
+            }
+        }
     }
 
     /* Buffers are never used for write, therefore mapping for read can be
@@ -131,7 +161,6 @@ struct pipe_resource *r300_buffer_create(struct pipe_screen *screen,
 {
     struct r300_screen *r300screen = r300_screen(screen);
     struct r300_resource *rbuf;
-    unsigned alignment = 16;
 
     rbuf = MALLOC_STRUCT(r300_resource);
 
@@ -147,13 +176,13 @@ struct pipe_resource *r300_buffer_create(struct pipe_screen *screen,
     if (templ->bind & PIPE_BIND_CONSTANT_BUFFER ||
         (!r300screen->caps.has_tcl &&
          (templ->bind & (PIPE_BIND_VERTEX_BUFFER | PIPE_BIND_INDEX_BUFFER)))) {
-        rbuf->malloced_buffer = MALLOC(templ->width0);
+        rbuf->malloced_buffer = align_malloc(templ->width0, 64);
         return &rbuf->b.b;
     }
 
     rbuf->buf =
         r300screen->rws->buffer_create(r300screen->rws,
-                                       rbuf->b.b.width0, alignment,
+                                       rbuf->b.b.width0, R300_BUFFER_ALIGNMENT,
                                        rbuf->b.b.bind, rbuf->domain);
     if (!rbuf->buf) {
         FREE(rbuf);