From 5a8b67f3638485fc1536ab7d2cfeccc854b5e8fc Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Fri, 29 May 2009 14:55:12 -0400 Subject: [PATCH] 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 9b057ad1b5f..bd537160f12 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 6f41bbcbbc0..8bfcb7b4e03 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 3db03578ede..3ceb2794b09 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 1f0604da5d3..ded5f51a6a1 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; -- 2.11.0