more cleanup

diff --git a/src/mesa/drivers/dri/r600/r600_context.c b/src/mesa/drivers/dri/r600/r600_context.c
index bd537160f12f68675211d966f5675a8f32b385eb..c54dae0c538516e8dc3fdec04b7563833e9e86e0 100644 (file)
--- 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 8bfcb7b4e03fdaaac013a20915bcb4f04f4409bf..321b05d9306a7d1d20c92da92887465975772ca4 100644 (file)
--- 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 3ceb2794b09ad62a9c862d9975c8da302ce7d247..9b302492317bf363aee56163374bec691cfbf1a0 100644 (file)
--- 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 85352022bc2908eadda65131b1b10ab356399eb8..e2de8faf7721c489c61fc66c207dafc2ee26bec1 100644 (file)
--- 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,