[Mesa-dev] [PATCH] gallium: remove unused data pointer from pipe_transfer

[Brian Paul]

On 10/17/2012 09:11 AM, Marek Olšák wrote:
> ---
>   src/gallium/drivers/i915/i915_resource_texture.c |    1 -
>   src/gallium/drivers/r300/r300_screen_buffer.c    |    1 -
>   src/gallium/drivers/r600/evergreen_compute.c     |    1 -
>   src/gallium/drivers/r600/r600_buffer.c           |    1 -
>   src/gallium/drivers/radeonsi/r600_buffer.c       |    1 -
>   src/gallium/include/pipe/p_state.h               |    1 -
>   6 files changed, 0 insertions(+), 6 deletions(-)
>
> diff --git a/src/gallium/drivers/i915/i915_resource_texture.c b/src/gallium/drivers/i915/i915_resource_texture.c
> index 52ef776..76b232f 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 37a7c77..652d757 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 655cf75..fb6c303 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 90ab247..f4566ee 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 2e65d28..66bb4d5 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 e88242d..6d0db0f 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;
>   };
>
>

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