Mesa (master): r600g: the vs/ps const arrays weren't actually being used.

Dave Airlie airlied at kemper.freedesktop.org
Wed Oct 13 05:55:46 UTC 2010


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

Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Oct 13 15:56:12 2010 +1000

r600g: the vs/ps const arrays weren't actually being used.

completely removed them.

---

 src/gallium/drivers/r600/r600_pipe.c |   14 --------------
 src/gallium/drivers/r600/r600_pipe.h |    2 --
 2 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index 69bfb2a..8eb9799 100644
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -87,8 +87,6 @@ static void r600_destroy_context(struct pipe_context *context)
 
 	FREE(rctx->ps_resource);
 	FREE(rctx->vs_resource);
-	FREE(rctx->vs_const);
-	FREE(rctx->ps_const);
 	FREE(rctx);
 }
 
@@ -175,18 +173,6 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
 		return NULL;
 	}
 
-	rctx->vs_const = CALLOC(R600_CONSTANT_ARRAY_SIZE, sizeof(struct r600_pipe_state));
-	if (!rctx->vs_const) {
-		FREE(rctx);
-		return NULL;
-	}
-
-	rctx->ps_const = CALLOC(R600_CONSTANT_ARRAY_SIZE, sizeof(struct r600_pipe_state));
-	if (!rctx->vs_const) {
-		FREE(rctx);
-		return NULL;
-	}
-
 	rctx->vs_resource = CALLOC(R600_RESOURCE_ARRAY_SIZE, sizeof(struct r600_pipe_state));
 	if (!rctx->vs_resource) {
 		FREE(rctx);
diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h
index 6ce1f96..8731786 100644
--- a/src/gallium/drivers/r600/r600_pipe.h
+++ b/src/gallium/drivers/r600/r600_pipe.h
@@ -125,8 +125,6 @@ struct r600_pipe_context {
 	struct pipe_clip_state		clip;
 	unsigned			vs_nconst;
 	unsigned			ps_nconst;
-	struct r600_pipe_state		*vs_const;
-	struct r600_pipe_state		*ps_const;
 	struct r600_pipe_state		*vs_resource;
 	struct r600_pipe_state		*ps_resource;
 	struct r600_pipe_state		config;




More information about the mesa-commit mailing list