diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-07-20 16:49:57 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-07-20 16:49:57 +0000 |
| commit | 122629f27925a9dc50029bebc5079f87f416a7e1 (patch) | |
| tree | f8800f9e5f4fff6bbd6c6496d5c74f8685b63372 /src/mesa/drivers/dri/r300/r300_shader.c | |
| parent | 459db7bd72131e63ed7687956819c4d0520972dd (diff) | |
Some structure renaming. Prefix vertex/fragment-related structs with
"gl_" to match other structs.
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_shader.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_shader.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_shader.c b/src/mesa/drivers/dri/r300/r300_shader.c index 0c5596159d..576b18953f 100644 --- a/src/mesa/drivers/dri/r300/r300_shader.c +++ b/src/mesa/drivers/dri/r300/r300_shader.c @@ -7,7 +7,8 @@ #include "r300_context.h" #include "r300_fragprog.h" -static void r300BindProgram(GLcontext *ctx, GLenum target, struct program *prog) +static void +r300BindProgram(GLcontext *ctx, GLenum target, struct gl_program *prog) { r300ContextPtr rmesa = R300_CONTEXT(ctx); @@ -16,7 +17,7 @@ static void r300BindProgram(GLcontext *ctx, GLenum target, struct program *prog) switch(target){ case GL_VERTEX_PROGRAM_ARB: - rmesa->curr_vp = (struct vertex_program *)vp; + rmesa->curr_vp = (struct gl_vertex_program *)vp; vp->ref_count++; #if 0 if((vp->ref_count % 1500) == 0) { @@ -33,7 +34,8 @@ static void r300BindProgram(GLcontext *ctx, GLenum target, struct program *prog) } } -static struct program *r300NewProgram(GLcontext *ctx, GLenum target, GLuint id) +static struct gl_program * +r300NewProgram(GLcontext *ctx, GLenum target, GLuint id) { struct r300_vertex_program *vp; struct r300_fragment_program *fp; @@ -58,7 +60,8 @@ static struct program *r300NewProgram(GLcontext *ctx, GLenum target, GLuint id) } -static void r300DeleteProgram(GLcontext *ctx, struct program *prog) +static void +r300DeleteProgram(GLcontext *ctx, struct gl_program *prog) { #if 0 r300ContextPtr rmesa = R300_CONTEXT(ctx); @@ -71,8 +74,8 @@ static void r300DeleteProgram(GLcontext *ctx, struct program *prog) _mesa_delete_program(ctx, prog); } -static void r300ProgramStringNotify(GLcontext *ctx, GLenum target, - struct program *prog) +static void +r300ProgramStringNotify(GLcontext *ctx, GLenum target, struct gl_program *prog) { struct r300_vertex_program *vp=(void *)prog; struct r300_fragment_program *fp = (struct r300_fragment_program *) prog; @@ -80,7 +83,7 @@ static void r300ProgramStringNotify(GLcontext *ctx, GLenum target, switch(target) { case GL_VERTEX_PROGRAM_ARB: vp->translated = GL_FALSE; - memset(&vp->translated, 0, sizeof(struct r300_vertex_program) - sizeof(struct vertex_program)); + memset(&vp->translated, 0, sizeof(struct r300_vertex_program) - sizeof(struct gl_vertex_program)); /*r300_translate_vertex_shader(vp);*/ break; case GL_FRAGMENT_PROGRAM_ARB: @@ -91,7 +94,8 @@ static void r300ProgramStringNotify(GLcontext *ctx, GLenum target, _tnl_program_string(ctx, target, prog); } -static GLboolean r300IsProgramNative(GLcontext *ctx, GLenum target, struct program *prog) +static GLboolean +r300IsProgramNative(GLcontext *ctx, GLenum target, struct gl_program *prog) { //struct r300_vertex_program *vp=(void *)prog; //r300ContextPtr rmesa = R300_CONTEXT(ctx); |