Mesa (r6xx-rewrite): more cleanup

[Alex Deucher]

Module: Mesa
Branch: r6xx-rewrite
Commit: 5a8b67f3638485fc1536ab7d2cfeccc854b5e8fc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5a8b67f3638485fc1536ab7d2cfeccc854b5e8fc

Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Fri May 29 14:55:12 2009 -0400

more cleanup

---

 src/mesa/drivers/dri/r600/r600_context.c |    3 ++-
 src/mesa/drivers/dri/r600/r600_context.h |    1 -
 src/mesa/drivers/dri/r600/r700_chip.c    |    4 ----
 src/mesa/drivers/dri/r600/r700_render.c  |    2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/mesa/drivers/dri/r600/r600_context.c b/src/mesa/drivers/dri/r600/r600_context.c
index 9b057ad..bd53716 100644
--- a/src/mesa/drivers/dri/r600/r600_context.c
+++ b/src/mesa/drivers/dri/r600/r600_context.c
@@ -92,6 +92,7 @@ int hw_tcl_on = 1;
 
 #include "extension_helper.h"
 
+extern const struct tnl_pipeline_stage *r700_pipeline[];
 
 const struct dri_extension card_extensions[] = {
   /* *INDENT-OFF* */
@@ -310,7 +311,7 @@ GLboolean r600CreateContext(const __GLcontextModes * glVisual,
 	/* Install the customized pipeline:
 	 */
 	_tnl_destroy_pipeline(ctx);
-	_tnl_install_pipeline(ctx, (const struct tnl_pipeline_stage **)(r600->chipobj.stages));
+	_tnl_install_pipeline(ctx, r700_pipeline);
 
 	/* Try and keep materials and vertices separate:
 	 */
diff --git a/src/mesa/drivers/dri/r600/r600_context.h b/src/mesa/drivers/dri/r600/r600_context.h
index 6f41bbc..8bfcb7b 100644
--- a/src/mesa/drivers/dri/r600/r600_context.h
+++ b/src/mesa/drivers/dri/r600/r600_context.h
@@ -140,7 +140,6 @@ typedef struct chip_object
 
     GLuint    (*GetTexObjSize)(void);
 
-    struct tnl_pipeline_stage **stages;
 } chip_object;
 
 /**
diff --git a/src/mesa/drivers/dri/r600/r700_chip.c b/src/mesa/drivers/dri/r600/r700_chip.c
index 3db0357..3ceb279 100644
--- a/src/mesa/drivers/dri/r600/r700_chip.c
+++ b/src/mesa/drivers/dri/r600/r700_chip.c
@@ -39,8 +39,6 @@
 #include "r700_vertprog.h"
 #include "r700_ioctl.h"
 
-extern const struct tnl_pipeline_stage *r700_pipeline[];
-
 static GLboolean r700DestroyChipObj(GLcontext * ctx)
 {
     context_t * context = R700_CONTEXT(ctx);
@@ -89,8 +87,6 @@ GLboolean r700InitChipObject(context_t *context)
 
     context->chipobj.GetTexObjSize  = r700GetTexObjSize;
 
-    context->chipobj.stages = r700_pipeline;
-
     context->chipobj.InitFuncs = r700InitFuncs;
 
     context->chipobj.InitState = r700InitState;
diff --git a/src/mesa/drivers/dri/r600/r700_render.c b/src/mesa/drivers/dri/r600/r700_render.c
index 1f0604d..ded5f51 100644
--- a/src/mesa/drivers/dri/r600/r700_render.c
+++ b/src/mesa/drivers/dri/r600/r700_render.c
@@ -195,7 +195,7 @@ GLboolean r700SyncSurf(context_t *context)
 
 unsigned int r700PrimitiveType(int prim)
 {
-    switch (prim & PRIM_MODE_MASK) 
+    switch (prim & PRIM_MODE_MASK)
     {
     case GL_POINTS:
         return DI_PT_POINTLIST;