From 949c489f592d5227843a06a5ae3851102cd46333 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher@gmail.com>
Date: Fri, 29 May 2009 14:23:04 -0400
Subject: [PATCH] more cleanup

---
 src/mesa/drivers/dri/r600/r600_context.c  | 2 --
 src/mesa/drivers/dri/r600/r600_context.h  | 8 --------
 src/mesa/drivers/dri/r600/r700_chip.c     | 4 ++--
 src/mesa/drivers/dri/r600/r700_fragprog.c | 2 +-
 src/mesa/drivers/dri/r600/r700_oglprog.c  | 4 ++--
 src/mesa/drivers/dri/r600/r700_vertprog.c | 2 +-
 6 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/mesa/drivers/dri/r600/r600_context.c b/src/mesa/drivers/dri/r600/r600_context.c
index 01440705c39..9b057ad1b5f 100644
--- a/src/mesa/drivers/dri/r600/r600_context.c
+++ b/src/mesa/drivers/dri/r600/r600_context.c
@@ -251,8 +251,6 @@ GLboolean r600CreateContext(const __GLcontextModes * glVisual,
 	r700InitChipObject(r600);  /* let the eag... */
 
     (r600->chipobj.InitFuncs)(&functions);
-    r600->chipobj.EmitShader     = r600EmitShader;
-    r600->chipobj.DeleteShader   = r600DeleteShader;
 
 	if (!radeonInitContext(&r600->radeon, &functions,
 			       glVisual, driContextPriv,
diff --git a/src/mesa/drivers/dri/r600/r600_context.h b/src/mesa/drivers/dri/r600/r600_context.h
index 63c018dc9b5..6f41bbcbbc0 100644
--- a/src/mesa/drivers/dri/r600/r600_context.h
+++ b/src/mesa/drivers/dri/r600/r600_context.h
@@ -140,14 +140,6 @@ typedef struct chip_object
 
     GLuint    (*GetTexObjSize)(void);
 
-    /* ------------  IN  ------------------- */
-    GLboolean (*EmitShader)( GLcontext * ctx, 
-                             void ** shaderbo,
-			                 GLvoid * data, 
-                             int sizeinDWORD,
-                             char * szShaderUsage);
-    GLboolean (*DeleteShader)(GLcontext * ctx, 
-                              void * shaderbo);
     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 81eacc74eb6..5cd0d72d6e5 100644
--- a/src/mesa/drivers/dri/r600/r700_chip.c
+++ b/src/mesa/drivers/dri/r600/r700_chip.c
@@ -55,12 +55,12 @@ static GLboolean r700DestroyChipObj(GLcontext * ctx)
 
     if(0 != r700->pbo_vs_clear)
     {
-        (context->chipobj.DeleteShader)(context, r700->pbo_vs_clear);    
+        r600DeleteShader(context, r700->pbo_vs_clear);    
     }
 
     if(0 != r700->pbo_fs_clear)
     {
-        (context->chipobj.DeleteShader)(context, r700->pbo_fs_clear);
+        r600DeleteShader(context, r700->pbo_fs_clear);
     }
 
     FREE(r700->pStateList);
diff --git a/src/mesa/drivers/dri/r600/r700_fragprog.c b/src/mesa/drivers/dri/r600/r700_fragprog.c
index 3aacad99197..c46094dcd7e 100644
--- a/src/mesa/drivers/dri/r600/r700_fragprog.c
+++ b/src/mesa/drivers/dri/r600/r700_fragprog.c
@@ -278,7 +278,7 @@ GLboolean r700SetupFragmentProgram(GLcontext * ctx)
 	    }
 
         /* Load fp to gpu */
-        (context->chipobj.EmitShader)(ctx, 
+        r600EmitShader(ctx, 
                        &(fp->shaderbo), 
                        (GLvoid *)(fp->r700Shader.pProgram),
                        fp->r700Shader.uShaderBinaryDWORDSize,
diff --git a/src/mesa/drivers/dri/r600/r700_oglprog.c b/src/mesa/drivers/dri/r600/r700_oglprog.c
index dc8c9361659..ba49367dc4f 100644
--- a/src/mesa/drivers/dri/r600/r700_oglprog.c
+++ b/src/mesa/drivers/dri/r600/r700_oglprog.c
@@ -97,7 +97,7 @@ static void r700DeleteProgram(GLcontext * ctx, struct gl_program *prog)
         vp = (struct r700_vertex_program*)prog;
         /* Release DMA region */
 
-        (context->chipobj.DeleteShader)(ctx, vp->shaderbo);
+        r600DeleteShader(ctx, vp->shaderbo);
 
         /* Clean up */
         Clean_Up_Assembler(&(vp->r700AsmCode));
@@ -108,7 +108,7 @@ static void r700DeleteProgram(GLcontext * ctx, struct gl_program *prog)
 		fp = (struct r700_fragment_program*)prog;
         /* Release DMA region */
 
-        (context->chipobj.DeleteShader)(ctx, fp->shaderbo);
+        r600DeleteShader(ctx, fp->shaderbo);
 
         /* Clean up */
         Clean_Up_Assembler(&(fp->r700AsmCode));
diff --git a/src/mesa/drivers/dri/r600/r700_vertprog.c b/src/mesa/drivers/dri/r600/r700_vertprog.c
index 932555376cb..2861918c423 100644
--- a/src/mesa/drivers/dri/r600/r700_vertprog.c
+++ b/src/mesa/drivers/dri/r600/r700_vertprog.c
@@ -357,7 +357,7 @@ GLboolean r700SetupVertexProgram(GLcontext * ctx)
 	    }
 
         /* Load vp to gpu */
-        (context->chipobj.EmitShader)(ctx, 
+        r600EmitShader(ctx, 
                        &(vp->shaderbo), 
                        (GLvoid *)(vp->r700Shader.pProgram),
                        vp->r700Shader.uShaderBinaryDWORDSize,
-- 
2.30.2