From: Marek Olšák <marek.olsak@amd.com>
Date: Wed, 24 Feb 2016 16:30:09 +0000 (+0100)
Subject: gallium/radeon: clean up r600_texture_get_handle
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=69d8b7511420e3c9053dc57da9d7f478c2baca48;p=mesa.git

gallium/radeon: clean up r600_texture_get_handle

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c
index 33f4042bee5..377dd3de578 100644
--- a/src/gallium/drivers/radeon/r600_texture.c
+++ b/src/gallium/drivers/radeon/r600_texture.c
@@ -250,21 +250,21 @@ static void r600_texture_init_metadata(struct r600_texture *rtex,
 }
 
 static boolean r600_texture_get_handle(struct pipe_screen* screen,
-				       struct pipe_resource *ptex,
+				       struct pipe_resource *resource,
 				       struct winsys_handle *whandle,
                                        unsigned usage)
 {
-	struct r600_texture *rtex = (struct r600_texture*)ptex;
-	struct r600_resource *resource = &rtex->resource;
-	struct radeon_surf *surface = &rtex->surface;
 	struct r600_common_screen *rscreen = (struct r600_common_screen*)screen;
+	struct r600_resource *res = (struct r600_resource*)resource;
+	struct r600_texture *rtex = (struct r600_texture*)resource;
 	struct radeon_bo_metadata metadata;
 
 	r600_texture_init_metadata(rtex, &metadata);
-	rscreen->ws->buffer_set_metadata(resource->buf, &metadata);
+	rscreen->ws->buffer_set_metadata(res->buf, &metadata);
 
-	return rscreen->ws->buffer_get_handle(resource->buf,
-						surface->level[0].pitch_bytes, whandle);
+	return rscreen->ws->buffer_get_handle(res->buf,
+					      rtex->surface.level[0].pitch_bytes,
+					      whandle);
 }
 
 static void r600_texture_destroy(struct pipe_screen *screen,