summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2011-04-03 18:14:49 +0200
committerMarek Olšák <maraeo@gmail.com>2011-04-03 19:32:27 +0200
commit437c748bf5072d2bded77a00c74c51cdb8b510e5 (patch)
tree3b200e5894cb2545e8fc621af5382970396bf21e
parentc35572352e3e92683988ee8d151b47f4190d62f9 (diff)
r300g: handle DISCARD_WHOLE_RESOURCE for buffers
-rw-r--r--src/gallium/drivers/r300/r300_screen_buffer.c35
1 files changed, 25 insertions, 10 deletions
diff --git a/src/gallium/drivers/r300/r300_screen_buffer.c b/src/gallium/drivers/r300/r300_screen_buffer.c
index 986ae384fbf..6c31c39b239 100644
--- a/src/gallium/drivers/r300/r300_screen_buffer.c
+++ b/src/gallium/drivers/r300/r300_screen_buffer.c
@@ -67,6 +67,20 @@ static void r300_buffer_destroy(struct pipe_screen *screen,
util_slab_free(&r300screen->pool_buffers, rbuf);
}
+static boolean r300_setup_new_winsys_buffer(struct r300_winsys_screen *rws,
+ struct r300_resource *rbuf)
+{
+ rbuf->buf = rws->buffer_create(rws,
+ rbuf->b.b.b.width0, 16,
+ rbuf->b.b.b.bind, rbuf->b.b.b.usage,
+ rbuf->domain);
+ if (!rbuf->buf)
+ return FALSE;
+
+ rbuf->cs_buf = rws->buffer_get_cs_handle(rbuf->buf);
+ return TRUE;
+}
+
static struct pipe_transfer*
r300_buffer_get_transfer(struct pipe_context *context,
struct pipe_resource *resource,
@@ -114,6 +128,16 @@ r300_buffer_transfer_map( struct pipe_context *pipe,
if (rbuf->constant_buffer)
return (uint8_t *) rbuf->constant_buffer + transfer->box.x;
+ /* Discard the whole resource if needed. */
+ if (transfer->usage & PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE &&
+ (rws->cs_is_buffer_referenced(r300->cs, rbuf->cs_buf) ||
+ rws->buffer_is_busy(rbuf->buf))) {
+ r300_winsys_bo_reference(&rbuf->buf, NULL);
+
+ r300_setup_new_winsys_buffer(rws, rbuf);
+ assert(rbuf->buf);
+ }
+
map = rws->buffer_map(rbuf->buf, r300->cs, transfer->usage);
if (map == NULL)
@@ -179,7 +203,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 = util_slab_alloc(&r300screen->pool_buffers);
@@ -199,19 +222,11 @@ struct pipe_resource *r300_buffer_create(struct pipe_screen *screen,
return &rbuf->b.b.b;
}
- rbuf->buf =
- r300screen->rws->buffer_create(r300screen->rws,
- rbuf->b.b.b.width0, alignment,
- rbuf->b.b.b.bind, rbuf->b.b.b.usage,
- rbuf->domain);
- if (!rbuf->buf) {
+ if (!r300_setup_new_winsys_buffer(r300screen->rws, rbuf)) {
util_slab_free(&r300screen->pool_buffers, rbuf);
return NULL;
}
- rbuf->cs_buf =
- r300screen->rws->buffer_get_cs_handle(rbuf->buf);
-
return &rbuf->b.b.b;
}