Mesa (master): r600g: use u_default_transfer_inline_write for all resource types

[Marek Olšák]

Module: Mesa
Branch: master
Commit: ab1328882101f67335a332e940fea92eeaf70e12
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ab1328882101f67335a332e940fea92eeaf70e12

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sun Feb 26 19:00:26 2012 +0100

r600g: use u_default_transfer_inline_write for all resource types

---

 src/gallium/drivers/r600/r600_buffer.c   |   25 +------------------------
 src/gallium/drivers/r600/r600_resource.c |    2 +-
 src/gallium/drivers/r600/r600_texture.c  |    2 +-
 3 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_buffer.c b/src/gallium/drivers/r600/r600_buffer.c
index 2fc93e8..454d448 100644
--- a/src/gallium/drivers/r600/r600_buffer.c
+++ b/src/gallium/drivers/r600/r600_buffer.c
@@ -111,29 +111,6 @@ static void r600_transfer_destroy(struct pipe_context *ctx,
 	util_slab_free(&rctx->pool_transfers, transfer);
 }
 
-static void r600_buffer_transfer_inline_write(struct pipe_context *pipe,
-						struct pipe_resource *resource,
-						unsigned level,
-						unsigned usage,
-						const struct pipe_box *box,
-						const void *data,
-						unsigned stride,
-						unsigned layer_stride)
-{
-	struct r600_context *rctx = (struct r600_context*)pipe;
-	struct r600_resource *rbuffer = r600_resource(resource);
-	uint8_t *map = NULL;
-
-	assert(rbuffer->b.user_ptr == NULL);
-
-	map = rctx->ws->buffer_map(rbuffer->buf, rctx->cs,
-				   PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE | usage);
-
-	memcpy(map + box->x, data, box->width);
-
-	rctx->ws->buffer_unmap(rbuffer->buf);
-}
-
 static const struct u_resource_vtbl r600_buffer_vtbl =
 {
 	u_default_resource_get_handle,		/* get_handle */
@@ -143,7 +120,7 @@ static const struct u_resource_vtbl r600_buffer_vtbl =
 	r600_buffer_transfer_map,		/* transfer_map */
 	r600_buffer_transfer_flush_region,	/* transfer_flush_region */
 	r600_buffer_transfer_unmap,		/* transfer_unmap */
-	r600_buffer_transfer_inline_write	/* transfer_inline_write */
+	NULL					/* transfer_inline_write */
 };
 
 bool r600_init_resource(struct r600_screen *rscreen,
diff --git a/src/gallium/drivers/r600/r600_resource.c b/src/gallium/drivers/r600/r600_resource.c
index 1dc63e9..39c9f42 100644
--- a/src/gallium/drivers/r600/r600_resource.c
+++ b/src/gallium/drivers/r600/r600_resource.c
@@ -60,7 +60,7 @@ void r600_init_context_resource_functions(struct r600_context *r600)
 	r600->context.transfer_flush_region = u_transfer_flush_region_vtbl;
 	r600->context.transfer_unmap = u_transfer_unmap_vtbl;
 	r600->context.transfer_destroy = u_transfer_destroy_vtbl;
-	r600->context.transfer_inline_write = u_transfer_inline_write_vtbl;
+	r600->context.transfer_inline_write = u_default_transfer_inline_write;
 }
 
 uint64_t r600_resource_va(struct pipe_screen *screen, struct pipe_resource *resource)
diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index 4687f7e..6ce04a4 100644
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -491,7 +491,7 @@ static const struct u_resource_vtbl r600_texture_vtbl =
 	r600_texture_transfer_map,	/* transfer_map */
 	u_default_transfer_flush_region,/* transfer_flush_region */
 	r600_texture_transfer_unmap,	/* transfer_unmap */
-	u_default_transfer_inline_write	/* transfer_inline_write */
+	NULL				/* transfer_inline_write */
 };
 
 static struct r600_resource_texture *