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 454d448beed80099a29b383e0350f08a8450a02b..733d707068be610be842f9a7db305f88a79a8d25 100644 (file)
--- 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 39c9f4274db679e09f0db72ef32ddfe3e4289376..0689d91a2995abaff1f1ac2883b59cba98791251 100644 (file)
--- 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 6ce04a42b7d85d6a0f7bddc3aa0ee9bad7c91c36..2b69fcd92f76a4aaa633ce9eeeeb3fefdb9eed5f 100644 (file)
--- 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 */
 };