Mesa (master): radeonsi: remove unused local variables

Marek Olšák mareko at kemper.freedesktop.org
Thu Oct 11 19:53:55 UTC 2012


Module: Mesa
Branch: master
Commit: 8e3e4145ce1bafe3183f8f27ccbc03c74f8dc23c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8e3e4145ce1bafe3183f8f27ccbc03c74f8dc23c

Author: Marek Olšák <maraeo at gmail.com>
Date:   Thu Oct 11 21:31:36 2012 +0200

radeonsi: remove unused local variables

---

 src/gallium/drivers/radeonsi/r600_blit.c       |    2 --
 src/gallium/drivers/radeonsi/r600_buffer.c     |    1 -
 src/gallium/drivers/radeonsi/radeonsi_pipe.c   |    5 -----
 src/gallium/drivers/radeonsi/radeonsi_shader.c |    1 -
 4 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/r600_blit.c b/src/gallium/drivers/radeonsi/r600_blit.c
index eecdb60..cea7e12 100644
--- a/src/gallium/drivers/radeonsi/r600_blit.c
+++ b/src/gallium/drivers/radeonsi/r600_blit.c
@@ -272,7 +272,6 @@ static void r600_compressed_to_blittable(struct pipe_resource *tex,
 				   struct texture_orig_info *orig)
 {
 	struct r600_resource_texture *rtex = (struct r600_resource_texture*)tex;
-	struct r600_screen *rscreen = (struct r600_screen *)tex->screen;
 	unsigned pixsize = util_format_get_blocksize(rtex->real_format);
 	int new_format;
 	int new_height, new_width;
@@ -307,7 +306,6 @@ static void r600_reset_blittable_to_compressed(struct pipe_resource *tex,
 					       struct texture_orig_info *orig)
 {
 	struct r600_resource_texture *rtex = (struct r600_resource_texture*)tex;
-	struct r600_screen *rscreen = (struct r600_screen *)tex->screen;
 
 	tex->format = orig->format;
 	tex->width0 = orig->width0;
diff --git a/src/gallium/drivers/radeonsi/r600_buffer.c b/src/gallium/drivers/radeonsi/r600_buffer.c
index 7fae048..2e65d28 100644
--- a/src/gallium/drivers/radeonsi/r600_buffer.c
+++ b/src/gallium/drivers/radeonsi/r600_buffer.c
@@ -39,7 +39,6 @@
 static void r600_buffer_destroy(struct pipe_screen *screen,
 				struct pipe_resource *buf)
 {
-	struct r600_screen *rscreen = (struct r600_screen*)screen;
 	struct si_resource *rbuffer = si_resource(buf);
 
 	pb_reference(&rbuffer->buf, NULL);
diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.c b/src/gallium/drivers/radeonsi/radeonsi_pipe.c
index 03a99eb..dcdbe2a 100644
--- a/src/gallium/drivers/radeonsi/radeonsi_pipe.c
+++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.c
@@ -289,7 +289,6 @@ static const char* r600_get_name(struct pipe_screen* pscreen)
 static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
 {
 	struct r600_screen *rscreen = (struct r600_screen *)pscreen;
-	enum radeon_family family = rscreen->family;
 
 	switch (param) {
 	/* Supported features (boolean caps). */
@@ -394,9 +393,6 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
 static float r600_get_paramf(struct pipe_screen* pscreen,
 			     enum pipe_capf param)
 {
-	struct r600_screen *rscreen = (struct r600_screen *)pscreen;
-	enum radeon_family family = rscreen->family;
-
 	switch (param) {
 	case PIPE_CAPF_MAX_LINE_WIDTH:
 	case PIPE_CAPF_MAX_LINE_WIDTH_AA:
@@ -418,7 +414,6 @@ static float r600_get_paramf(struct pipe_screen* pscreen,
 
 static int r600_get_shader_param(struct pipe_screen* pscreen, unsigned shader, enum pipe_shader_cap param)
 {
-	struct r600_screen *rscreen = (struct r600_screen *)pscreen;
 	switch(shader)
 	{
 	case PIPE_SHADER_FRAGMENT:
diff --git a/src/gallium/drivers/radeonsi/radeonsi_shader.c b/src/gallium/drivers/radeonsi/radeonsi_shader.c
index f65e692..8a55e0d 100644
--- a/src/gallium/drivers/radeonsi/radeonsi_shader.c
+++ b/src/gallium/drivers/radeonsi/radeonsi_shader.c
@@ -191,7 +191,6 @@ static void declare_input_vs(
 	LLVMValueRef input;
 	struct lp_build_context * uint = &si_shader_ctx->radeon_bld.soa.bld_base.uint_bld;
 	struct lp_build_context * base = &si_shader_ctx->radeon_bld.soa.bld_base.base;
-	struct r600_context *rctx = si_shader_ctx->rctx;
 	//struct pipe_vertex_element *velem = &rctx->vertex_elements->elements[input_index];
 	unsigned chan;
 




More information about the mesa-commit mailing list