summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2009-05-29 14:23:04 -0400
committerAlex Deucher <alexdeucher@gmail.com>2009-05-29 14:23:04 -0400
commit949c489f592d5227843a06a5ae3851102cd46333 (patch)
tree5c011dbefaa2ea22d82f82cbc9fb9a8c68efd93f /src
parent97ed5cffcb051da21c7bfdbbf11b97da657c015c (diff)
more cleanup
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/r600/r600_context.c2
-rw-r--r--src/mesa/drivers/dri/r600/r600_context.h8
-rw-r--r--src/mesa/drivers/dri/r600/r700_chip.c4
-rw-r--r--src/mesa/drivers/dri/r600/r700_fragprog.c2
-rw-r--r--src/mesa/drivers/dri/r600/r700_oglprog.c4
-rw-r--r--src/mesa/drivers/dri/r600/r700_vertprog.c2
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 01440705c3..9b057ad1b5 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 63c018dc9b..6f41bbcbbc 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 81eacc74eb..5cd0d72d6e 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 3aacad9919..c46094dcd7 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 dc8c936165..ba49367dc4 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 932555376c..2861918c42 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,