From e9484e40858ffd4474571b27136e7ea0f2b682db Mon Sep 17 00:00:00 2001 From: Aapo Tahkola Date: Mon, 13 Mar 2006 20:40:46 +0000 Subject: Clean build. --- src/mesa/drivers/dri/r300/r300_shader.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'src/mesa/drivers/dri/r300/r300_shader.c') diff --git a/src/mesa/drivers/dri/r300/r300_shader.c b/src/mesa/drivers/dri/r300/r300_shader.c index 582cb2cf98..f32e86065d 100644 --- a/src/mesa/drivers/dri/r300/r300_shader.c +++ b/src/mesa/drivers/dri/r300/r300_shader.c @@ -4,10 +4,7 @@ #include "program.h" #include "r300_context.h" -#include "program_instruction.h" -#if USE_ARB_F_P == 1 #include "r300_fragprog.h" -#endif static void r300BindProgram(GLcontext *ctx, GLenum target, struct program *prog) { @@ -18,7 +15,7 @@ static void r300BindProgram(GLcontext *ctx, GLenum target, struct program *prog) switch(target){ case GL_VERTEX_PROGRAM_ARB: - rmesa->curr_vp = vp; + rmesa->curr_vp = (struct vertex_program *)vp; vp->ref_count++; #if 0 if((vp->ref_count % 1500) == 0) { @@ -39,7 +36,6 @@ static struct program *r300NewProgram(GLcontext *ctx, GLenum target, GLuint id) { struct r300_vertex_program *vp; struct r300_fragment_program *fp; - struct ati_fragment_shader *afs; switch(target){ case GL_VERTEX_STATE_PROGRAM_NV: @@ -53,12 +49,6 @@ static struct program *r300NewProgram(GLcontext *ctx, GLenum target, GLuint id) case GL_FRAGMENT_PROGRAM_NV: fp=CALLOC_STRUCT(r300_fragment_program); return _mesa_init_fragment_program(ctx, &fp->mesa_program, target, id); -#if 00 - /* _mesa_new_ati_fragment_shader() is now called instead */ - case GL_FRAGMENT_SHADER_ATI: - afs=CALLOC_STRUCT(ati_fragment_shader); - return _mesa_init_ati_fragment_shader(ctx, afs, target, id); -#endif default: _mesa_problem(ctx, "Bad target in r300NewProgram"); } @@ -69,12 +59,14 @@ static struct program *r300NewProgram(GLcontext *ctx, GLenum target, GLuint id) static void r300DeleteProgram(GLcontext *ctx, struct program *prog) { +#if 0 r300ContextPtr rmesa = R300_CONTEXT(ctx); struct r300_vertex_program *vp=(void *)prog; - /*if(rmesa->curr_vp == vp) - rmesa->curr_vp = NULL;*/ - + if(rmesa->curr_vp == vp) + rmesa->curr_vp = NULL; +#endif + _mesa_delete_program(ctx, prog); } @@ -88,7 +80,7 @@ static void r300ProgramStringNotify(GLcontext *ctx, GLenum target, case GL_VERTEX_PROGRAM_ARB: vp->translated = GL_FALSE; memset(&vp->translated, 0, sizeof(struct r300_vertex_program) - sizeof(struct vertex_program)); - /*translate_vertex_shader(vp);*/ + /*r300_translate_vertex_shader(vp);*/ break; case GL_FRAGMENT_PROGRAM_ARB: fp->translated = GL_FALSE; -- cgit v1.2.3