From: Marek Olšák <maraeo@gmail.com>
Date: Sun, 26 Feb 2012 18:15:45 +0000 (+0100)
Subject: r600g: use u_default_transfer_flush_region for all resource types
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bf4fedcef3e345f5117232d58bd9000c2441de74;p=mesa.git

r600g: use u_default_transfer_flush_region for all resource types
---

diff --git a/src/gallium/drivers/r600/r600_buffer.c b/src/gallium/drivers/r600/r600_buffer.c
index 454d448beed..733d707068b 100644
--- a/src/gallium/drivers/r600/r600_buffer.c
+++ b/src/gallium/drivers/r600/r600_buffer.c
@@ -98,12 +98,6 @@ static void r600_buffer_transfer_unmap(struct pipe_context *pipe,
 	rctx->ws->buffer_unmap(rbuffer->buf);
 }
 
-static void r600_buffer_transfer_flush_region(struct pipe_context *pipe,
-						struct pipe_transfer *transfer,
-						const struct pipe_box *box)
-{
-}
-
 static void r600_transfer_destroy(struct pipe_context *ctx,
 				  struct pipe_transfer *transfer)
 {
@@ -118,7 +112,7 @@ static const struct u_resource_vtbl r600_buffer_vtbl =
 	r600_get_transfer,			/* get_transfer */
 	r600_transfer_destroy,			/* transfer_destroy */
 	r600_buffer_transfer_map,		/* transfer_map */
-	r600_buffer_transfer_flush_region,	/* transfer_flush_region */
+	NULL,					/* transfer_flush_region */
 	r600_buffer_transfer_unmap,		/* transfer_unmap */
 	NULL					/* transfer_inline_write */
 };
diff --git a/src/gallium/drivers/r600/r600_resource.c b/src/gallium/drivers/r600/r600_resource.c
index 39c9f4274db..0689d91a299 100644
--- a/src/gallium/drivers/r600/r600_resource.c
+++ b/src/gallium/drivers/r600/r600_resource.c
@@ -57,7 +57,7 @@ void r600_init_context_resource_functions(struct r600_context *r600)
 {
 	r600->context.get_transfer = u_get_transfer_vtbl;
 	r600->context.transfer_map = u_transfer_map_vtbl;
-	r600->context.transfer_flush_region = u_transfer_flush_region_vtbl;
+	r600->context.transfer_flush_region = u_default_transfer_flush_region;
 	r600->context.transfer_unmap = u_transfer_unmap_vtbl;
 	r600->context.transfer_destroy = u_transfer_destroy_vtbl;
 	r600->context.transfer_inline_write = u_default_transfer_inline_write;
diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index 6ce04a42b7d..2b69fcd92f7 100644
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -489,7 +489,7 @@ static const struct u_resource_vtbl r600_texture_vtbl =
 	r600_texture_get_transfer,	/* get_transfer */
 	r600_texture_transfer_destroy,	/* transfer_destroy */
 	r600_texture_transfer_map,	/* transfer_map */
-	u_default_transfer_flush_region,/* transfer_flush_region */
+	NULL,				/* transfer_flush_region */
 	r600_texture_transfer_unmap,	/* transfer_unmap */
 	NULL				/* transfer_inline_write */
 };