Mesa (r6xx-rewrite): more cleanup
Alex Deucher
agd5f at kemper.freedesktop.org
Fri May 29 19:40:43 UTC 2009
Module: Mesa
Branch: r6xx-rewrite
Commit: cb393772530fca46ba699cf33cb213fb28713213
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb393772530fca46ba699cf33cb213fb28713213
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Fri May 29 15:04:44 2009 -0400
more cleanup
---
src/mesa/drivers/dri/r600/r600_context.c | 7 +++++--
src/mesa/drivers/dri/r600/r600_context.h | 6 ------
src/mesa/drivers/dri/r600/r700_chip.c | 14 --------------
src/mesa/drivers/dri/r600/r700_tex.c | 4 ----
4 files changed, 5 insertions(+), 26 deletions(-)
diff --git a/src/mesa/drivers/dri/r600/r600_context.c b/src/mesa/drivers/dri/r600/r600_context.c
index bd53716..c54dae0 100644
--- a/src/mesa/drivers/dri/r600/r600_context.c
+++ b/src/mesa/drivers/dri/r600/r600_context.c
@@ -251,7 +251,10 @@ GLboolean r600CreateContext(const __GLcontextModes * glVisual,
r700InitChipObject(r600); /* let the eag... */
- (r600->chipobj.InitFuncs)(&functions);
+ r700InitStateFuncs(&functions);
+ r700InitTextureFuncs(&functions);
+ r700InitShaderFuncs(&functions);
+ r700InitIoctlFuncs(&functions);
if (!radeonInitContext(&r600->radeon, &functions,
glVisual, driContextPriv,
@@ -374,7 +377,7 @@ GLboolean r600CreateContext(const __GLcontextModes * glVisual,
r600InitCmdBuf(r600);
- (r600->chipobj.InitState)(r600->radeon.glCtx);
+ r700InitState(r600->radeon.glCtx);
TNL_CONTEXT(ctx)->Driver.RunPipeline = r600RunPipeline;
diff --git a/src/mesa/drivers/dri/r600/r600_context.h b/src/mesa/drivers/dri/r600/r600_context.h
index 8bfcb7b..321b05d 100644
--- a/src/mesa/drivers/dri/r600/r600_context.h
+++ b/src/mesa/drivers/dri/r600/r600_context.h
@@ -134,12 +134,6 @@ typedef struct chip_object
/* ------------ OUT ------------------- */
GLboolean (*DestroyChipObj)(GLcontext * ctx);
- void (*InitFuncs)(struct dd_function_table *functions);
-
- void (*InitState)(GLcontext * ctx);
-
- GLuint (*GetTexObjSize)(void);
-
} chip_object;
/**
diff --git a/src/mesa/drivers/dri/r600/r700_chip.c b/src/mesa/drivers/dri/r600/r700_chip.c
index 3ceb279..9b30249 100644
--- a/src/mesa/drivers/dri/r600/r700_chip.c
+++ b/src/mesa/drivers/dri/r600/r700_chip.c
@@ -58,14 +58,6 @@ static GLboolean r700DestroyChipObj(GLcontext * ctx)
return GL_TRUE;
}
-static void r700InitFuncs(struct dd_function_table *functions)
-{
- r700InitStateFuncs(functions);
- r700InitTextureFuncs(functions);
- r700InitShaderFuncs(functions);
- r700InitIoctlFuncs(functions);
-}
-
#define LINK_STATES(reg) \
do \
{ \
@@ -85,12 +77,6 @@ GLboolean r700InitChipObject(context_t *context)
context->chipobj.DestroyChipObj = r700DestroyChipObj;
- context->chipobj.GetTexObjSize = r700GetTexObjSize;
-
- context->chipobj.InitFuncs = r700InitFuncs;
-
- context->chipobj.InitState = r700InitState;
-
/* init state list */
r700->pStateList = (ContextState*) MALLOC (sizeof(ContextState)*sizeof(R700_CHIP_CONTEXT)/sizeof(unsigned int));
pStateListWork = r700->pStateList;
diff --git a/src/mesa/drivers/dri/r600/r700_tex.c b/src/mesa/drivers/dri/r600/r700_tex.c
index 8535202..e2de8fa 100644
--- a/src/mesa/drivers/dri/r600/r700_tex.c
+++ b/src/mesa/drivers/dri/r600/r700_tex.c
@@ -46,10 +46,6 @@
#include "r700_tex.h"
-GLuint r700GetTexObjSize(void)
-{
- return sizeof(r700TexObj);
-}
/* to be enable */
void r700SetTexBuffer(__DRIcontext *pDRICtx, GLint target,
More information about the mesa-commit
mailing list