u_vbuf: remove u_vbuf_resource

1 files changed, 14 insertions, 14 deletions

diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index ce66117ed47..99cba964a32 100644
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -37,7 +37,7 @@ static void r600_copy_to_staging_texture(struct pipe_context *ctx, struct r600_t
 	struct pipe_transfer *transfer = (struct pipe_transfer*)rtransfer;
 	struct pipe_resource *texture = transfer->resource;
 
-	ctx->resource_copy_region(ctx, &rtransfer->staging->b.b.b,
+	ctx->resource_copy_region(ctx, &rtransfer->staging->b.b,
 				0, 0, 0, 0, texture, transfer->level,
 				&transfer->box);
 }
@@ -57,7 +57,7 @@ static void r600_copy_from_staging_texture(struct pipe_context *ctx, struct r600
 	sbox.depth = 1;
 	ctx->resource_copy_region(ctx, texture, transfer->level,
 				  transfer->box.x, transfer->box.y, transfer->box.z,
-				  &rtransfer->staging->b.b.b,
+				  &rtransfer->staging->b.b,
 				  0, &sbox);
 }
 
@@ -66,7 +66,7 @@ unsigned r600_texture_get_offset(struct r600_resource_texture *rtex,
 {
 	unsigned offset = rtex->offset[level];
 
-	switch (rtex->resource.b.b.b.target) {
+	switch (rtex->resource.b.b.target) {
 	case PIPE_TEXTURE_3D:
 	case PIPE_TEXTURE_CUBE:
 	default:
@@ -163,7 +163,7 @@ static unsigned r600_texture_get_nblocksx(struct pipe_screen *screen,
 					  struct r600_resource_texture *rtex,
 					  unsigned level)
 {
-	struct pipe_resource *ptex = &rtex->resource.b.b.b;
+	struct pipe_resource *ptex = &rtex->resource.b.b;
 	unsigned nblocksx, block_align, width;
 	unsigned blocksize = util_format_get_blocksize(rtex->real_format);
 
@@ -183,7 +183,7 @@ static unsigned r600_texture_get_nblocksy(struct pipe_screen *screen,
 					  struct r600_resource_texture *rtex,
 					  unsigned level)
 {
-	struct pipe_resource *ptex = &rtex->resource.b.b.b;
+	struct pipe_resource *ptex = &rtex->resource.b.b;
 	unsigned height, tile_height;
 
 	height = mip_minify(ptex->height0, level);
@@ -208,7 +208,7 @@ static void r600_texture_set_array_mode(struct pipe_screen *screen,
 					struct r600_resource_texture *rtex,
 					unsigned level, unsigned array_mode)
 {
-	struct pipe_resource *ptex = &rtex->resource.b.b.b;
+	struct pipe_resource *ptex = &rtex->resource.b.b;
 
 	switch (array_mode) {
 	case V_0280A0_ARRAY_LINEAR_GENERAL:
@@ -311,7 +311,7 @@ static int r600_setup_surface(struct pipe_screen *screen,
 			      unsigned array_mode,
 			      unsigned pitch_in_bytes_override)
 {
-	struct pipe_resource *ptex = &rtex->resource.b.b.b;
+	struct pipe_resource *ptex = &rtex->resource.b.b;
 	struct r600_screen *rscreen = (struct r600_screen*)screen;
 	unsigned i;
 	int r;
@@ -364,7 +364,7 @@ static void r600_setup_miptree(struct pipe_screen *screen,
 			       struct r600_resource_texture *rtex,
 			       unsigned array_mode)
 {
-	struct pipe_resource *ptex = &rtex->resource.b.b.b;
+	struct pipe_resource *ptex = &rtex->resource.b.b;
 	enum chip_class chipc = ((struct r600_screen*)screen)->chip_class;
 	unsigned size, layer_size, i, offset;
 	unsigned nblocksx, nblocksy;
@@ -501,10 +501,10 @@ r600_texture_create_object(struct pipe_screen *screen,
 		return NULL;
 
 	resource = &rtex->resource;
-	resource->b.b.b = *base;
-	resource->b.b.vtbl = &r600_texture_vtbl;
-	pipe_reference_init(&resource->b.b.b.reference, 1);
-	resource->b.b.b.screen = screen;
+	resource->b.b = *base;
+	resource->b.vtbl = &r600_texture_vtbl;
+	pipe_reference_init(&resource->b.b.reference, 1);
+	resource->b.b.screen = screen;
 	rtex->pitch_override = pitch_in_bytes_override;
 	rtex->real_format = base->format;
 
@@ -573,7 +573,7 @@ r600_texture_create_object(struct pipe_screen *screen,
 		stencil_align = r600_get_base_alignment(screen, rtex->stencil->real_format, array_mode);
 		stencil_offset = align(rtex->size, stencil_align);
 
-		for (unsigned i = 0; i <= rtex->stencil->resource.b.b.b.last_level; i++)
+		for (unsigned i = 0; i <= rtex->stencil->resource.b.b.last_level; i++)
 			rtex->stencil->offset[i] += stencil_offset;
 
 		rtex->size = stencil_offset + rtex->stencil->size;
@@ -581,7 +581,7 @@ r600_texture_create_object(struct pipe_screen *screen,
 
 	/* Now create the backing buffer. */
 	if (!buf && alloc_bo) {
-		struct pipe_resource *ptex = &rtex->resource.b.b.b;
+		struct pipe_resource *ptex = &rtex->resource.b.b;
 		unsigned base_align = r600_get_base_alignment(screen, ptex->format, array_mode);
 
 		if (rscreen->use_surface_alloc) {