From 897af1d499ed91ed3629432424eb1ac62bff2c5f Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Sun, 26 Feb 2012 19:44:45 +0100 Subject: r600g: cleanup r600_transfer_struct Especially rename staging_texture to staging and change its type to r600_resource. I will reuse it for buffers later. --- src/gallium/drivers/r600/r600_resource.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/gallium/drivers/r600/r600_resource.h') diff --git a/src/gallium/drivers/r600/r600_resource.h b/src/gallium/drivers/r600/r600_resource.h index a53ecb8d37d..425222381d3 100644 --- a/src/gallium/drivers/r600/r600_resource.h +++ b/src/gallium/drivers/r600/r600_resource.h @@ -29,14 +29,10 @@ /* flag to indicate a resource is to be used as a transfer so should not be tiled */ #define R600_RESOURCE_FLAG_TRANSFER PIPE_RESOURCE_FLAG_DRV_PRIV -/* Texture transfer. */ struct r600_transfer { - /* Base class. */ struct pipe_transfer transfer; - /* Buffer transfer. */ - struct pipe_transfer *buffer_transfer; + struct r600_resource *staging; unsigned offset; - struct pipe_resource *staging_texture; }; struct r600_resource_texture { -- cgit v1.2.3