diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-09-03 16:39:57 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2005-09-03 16:39:57 +0000 |
| commit | 7fa6c1afb9b85231c3b2e8c51672e9ca26efc070 (patch) | |
| tree | 2cf1ff150f6820a4dbb6ccc46d6065a768dcf435 /src/mesa/drivers/dri/r300/r300_shader.c | |
| parent | 624ad14a581e9befdfda5335b775d8d1f55fbe56 (diff) | |
silence misc warnings
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_shader.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_shader.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_shader.c b/src/mesa/drivers/dri/r300/r300_shader.c index 9c6788ec3e..aa9645e163 100644 --- a/src/mesa/drivers/dri/r300/r300_shader.c +++ b/src/mesa/drivers/dri/r300/r300_shader.c @@ -11,8 +11,10 @@ static void r300BindProgram(GLcontext *ctx, GLenum target, struct program *prog) { + /* r300ContextPtr rmesa = R300_CONTEXT(ctx); struct r300_vertex_program *vp=(void *)prog; + */ switch(target){ case GL_VERTEX_PROGRAM_ARB: @@ -40,24 +42,29 @@ static struct program *r300NewProgram(GLcontext *ctx, GLenum target, GLuint id) switch(target){ case GL_VERTEX_PROGRAM_ARB: vp=CALLOC_STRUCT(r300_vertex_program); - return _mesa_init_vertex_program(ctx, &vp->mesa_program, target, id); - + return _mesa_init_vertex_program(ctx, &vp->mesa_program, target, id); case GL_FRAGMENT_PROGRAM_ARB: #if USE_ARB_F_P == 1 fp=CALLOC_STRUCT(r300_fragment_program); fp->ctx = ctx; - return _mesa_init_fragment_program(ctx, &fp->mesa_program, target, id); + return _mesa_init_fragment_program(ctx, &fp->mesa_program, target, id); #else fp=CALLOC_STRUCT(fragment_program); - return _mesa_init_fragment_program(ctx, fp, target, id); + return _mesa_init_fragment_program(ctx, fp, target, id); #endif case GL_FRAGMENT_PROGRAM_NV: +#if USE_ARB_F_P == 1 + fp=CALLOC_STRUCT(r300_fragment_program); + return _mesa_init_fragment_program(ctx, &fp->mesa_program, target, id); +#else fp=CALLOC_STRUCT(fragment_program); - return _mesa_init_fragment_program(ctx, fp, target, id); - + return _mesa_init_fragment_program(ctx, fp, target, id); +#endif case GL_FRAGMENT_SHADER_ATI: afs=CALLOC_STRUCT(ati_fragment_shader); - return _mesa_init_ati_fragment_shader(ctx, afs, target, id); + return _mesa_init_ati_fragment_shader(ctx, afs, target, id); + default: + _mesa_problem(ctx, "Bad target in r300NewProgram"); } return NULL; @@ -75,9 +82,9 @@ static void r300DeleteProgram(GLcontext *ctx, struct program *prog) static void r300ProgramStringNotify(GLcontext *ctx, GLenum target, struct program *prog) { - struct r300_vertex_program *vp=(void *)prog; + /*struct r300_vertex_program *vp=(void *)prog;*/ #if USE_ARB_F_P == 1 - struct r300_fragment_program *fp=(void *)prog; + struct r300_fragment_program *fp = (struct r300_fragment_program *) prog; #endif switch(target) { |