diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2005-07-20 23:24:55 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2005-07-20 23:24:55 +0000 |
| commit | 3e8efc3753e0aa248ba91f42a05a8794e4343f3d (patch) | |
| tree | eced5ae23ee3c0d95a446d405fe7b6d5f33b4a83 /src/mesa/drivers/dri/r300/r300_render.c | |
| parent | aeb0ee771b1ba82231a2d6caf8fb3371ad0e59ec (diff) | |
Clean up warnings in r300 code by making some symbols static, adding prototypes
for others, and being cleaner with types in fragment/vertex program structures.
One warning in r300_shader.c is still concerning.
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_render.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_render.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c index 047a63e286..a0769e27f8 100644 --- a/src/mesa/drivers/dri/r300/r300_render.c +++ b/src/mesa/drivers/dri/r300/r300_render.c @@ -44,6 +44,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "swrast_setup/swrast_setup.h" #include "array_cache/acache.h" #include "tnl/tnl.h" +#include "tnl/t_vp_build.h" #include "radeon_reg.h" #include "radeon_macros.h" @@ -646,7 +647,9 @@ static void dtr(struct tnl_pipeline_stage *stage) (void)stage; } -GLboolean r300_create_render(GLcontext *ctx, struct tnl_pipeline_stage *stage){ +static GLboolean r300_create_render(GLcontext *ctx, + struct tnl_pipeline_stage *stage) +{ return GL_TRUE; } @@ -678,12 +681,12 @@ static GLboolean r300_run_tcl_render(GLcontext *ctx, if(ctx->VertexProgram._Enabled == GL_FALSE){ _tnl_UpdateFixedFunctionProgram(ctx); } - vp = CURRENT_VERTEX_SHADER(ctx); + vp = (struct r300_vertex_program *)CURRENT_VERTEX_SHADER(ctx); if(vp->translated == GL_FALSE) translate_vertex_shader(vp); if(vp->translated == GL_FALSE){ fprintf(stderr, "Failing back to sw-tcl\n"); - debug_vp(ctx, vp); + debug_vp(ctx, &vp->mesa_program); hw_tcl_on=future_hw_tcl_on=0; r300ResetHwState(rmesa); return GL_TRUE; |