gallium: remove unused data pointer from pipe_transfer

Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/gallium/drivers/i915/i915_resource_texture.c b/src/gallium/drivers/i915/i915_resource_texture.c
index 52ef776b3cee1cfff816a15a54af6d05b86b2842..76b232fd3e11cca1fa12715d990d0067839b033f 100644 (file)
--- a/src/gallium/drivers/i915/i915_resource_texture.c
+++ b/src/gallium/drivers/i915/i915_resource_texture.c
@@ -733,7 +733,6 @@ i915_texture_transfer_map(struct pipe_context *pipe,
    transfer->staging_texture = NULL;
    /* XXX: handle depth textures everyhwere*/
    transfer->b.layer_stride = 0;
-   transfer->b.data = NULL;
 
    /* if we use staging transfers, only support textures we can render to,
     * because we need that for u_blitter */

diff --git a/src/gallium/drivers/r300/r300_screen_buffer.c b/src/gallium/drivers/r300/r300_screen_buffer.c
index 37a7c77010ab9bea703f31c4f917390a0d9d0639..652d757db5d7ea1b65ac7eea42c212c0ef2d7f7f 100644 (file)
--- a/src/gallium/drivers/r300/r300_screen_buffer.c
+++ b/src/gallium/drivers/r300/r300_screen_buffer.c
@@ -84,7 +84,6 @@ 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;

diff --git a/src/gallium/drivers/r600/evergreen_compute.c b/src/gallium/drivers/r600/evergreen_compute.c
index 557159496467493a2696eda1a5ef87a11e25e356..25263f3b013cc024d08fc541229ba580f740f122 100644 (file)
--- a/src/gallium/drivers/r600/evergreen_compute.c
+++ b/src/gallium/drivers/r600/evergreen_compute.c
@@ -870,7 +870,6 @@ void *r600_compute_global_transfer_map(
        transfer->box = *box;
        transfer->stride = 0;
        transfer->layer_stride = 0;
-       transfer->data = NULL;
 
        assert(transfer->resource->target == PIPE_BUFFER);
        assert(transfer->resource->bind & PIPE_BIND_GLOBAL);

diff --git a/src/gallium/drivers/r600/r600_buffer.c b/src/gallium/drivers/r600/r600_buffer.c
index 90ab2475d75fdaee463965fa73d74d42641294ab..f4566eeb9aaed227121d369eda8745013cab6379 100644 (file)
--- a/src/gallium/drivers/r600/r600_buffer.c
+++ b/src/gallium/drivers/r600/r600_buffer.c
@@ -77,7 +77,6 @@ static void *r600_buffer_get_transfer(struct pipe_context *ctx,
        transfer->transfer.box = *box;
        transfer->transfer.stride = 0;
        transfer->transfer.layer_stride = 0;
-       transfer->transfer.data = NULL;
        transfer->staging = NULL;
        transfer->offset = 0;
        transfer->staging = staging;

diff --git a/src/gallium/drivers/radeonsi/r600_buffer.c b/src/gallium/drivers/radeonsi/r600_buffer.c
index 2e65d28f2934f7503c88222fc56e43faf5619326..66bb4d5d914c03af9907bf1cdd4c4deec0551570 100644 (file)
--- a/src/gallium/drivers/radeonsi/r600_buffer.c
+++ b/src/gallium/drivers/radeonsi/r600_buffer.c
@@ -69,7 +69,6 @@ static void *r600_buffer_transfer_map(struct pipe_context *ctx,
        transfer->box = *box;
        transfer->stride = 0;
        transfer->layer_stride = 0;
-       transfer->data = NULL;
         *ptransfer = transfer;
 
        return (uint8_t*)data + transfer->box.x;

diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index e88242dd7697fbb0274c46f5fb3d83c425b337ee..6d0db0f86f89d1e65028fa5811255527ef75efef 100644 (file)
--- a/src/gallium/include/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
@@ -429,7 +429,6 @@ struct pipe_transfer
    struct pipe_box box;            /**< region of the resource to access */
    unsigned stride;                /**< row stride in bytes */
    unsigned layer_stride;          /**< image/layer stride in bytes */
-   void *data;
 };