summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2009-05-29 15:04:44 -0400
committerAlex Deucher <alexdeucher@gmail.com>2009-05-29 15:04:44 -0400
commitcb393772530fca46ba699cf33cb213fb28713213 (patch)
tree4c75b210d79866aaf61b24db31c1f000c045df4a /src
parent5a8b67f3638485fc1536ab7d2cfeccc854b5e8fc (diff)
more cleanup
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/r600/r600_context.c7
-rw-r--r--src/mesa/drivers/dri/r600/r600_context.h6
-rw-r--r--src/mesa/drivers/dri/r600/r700_chip.c14
-rw-r--r--src/mesa/drivers/dri/r600/r700_tex.c4
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 bd537160f1..c54dae0c53 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 8bfcb7b4e0..321b05d930 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 3ceb2794b0..9b30249231 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 85352022bc..e2de8faf77 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,