From: Marek Olšák <maraeo@gmail.com>
Date: Wed, 17 Oct 2012 15:01:37 +0000 (+0200)
Subject: gallium: remove unused data pointer from pipe_transfer
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e5a9bf55231aa14f6ae831a5c47d7176cb6c230b;p=mesa.git

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 52ef776b3ce..76b232fd3e1 100644
--- 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 37a7c77010a..652d757db5d 100644
--- 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 55715949646..25263f3b013 100644
--- 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 90ab2475d75..f4566eeb9aa 100644
--- 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 2e65d28f293..66bb4d5d914 100644
--- 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 e88242dd769..6d0db0f86f8 100644
--- 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;
 };