diff options
author | Aapo Tahkola <aet@rasterburn.org> | 2005-04-30 11:06:14 +0000 |
---|---|---|
committer | Aapo Tahkola <aet@rasterburn.org> | 2005-04-30 11:06:14 +0000 |
commit | 7d33053e47c8e70a1530d810babab6294ae19782 (patch) | |
tree | 6d05251e15eb759f1adcc61d3358131a1b20d808 /src/mesa/drivers/dri/r300/r300_render.c | |
parent | 47d18cbb6457316896524eb383f864d0ac0d638d (diff) |
r300 side support for fixed function pipeline. This isnt functional with current Mesa.
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_render.c')
-rw-r--r-- | src/mesa/drivers/dri/r300/r300_render.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c index b5b75c8d85..4ecb2905b1 100644 --- a/src/mesa/drivers/dri/r300/r300_render.c +++ b/src/mesa/drivers/dri/r300/r300_render.c @@ -748,6 +748,12 @@ static GLboolean r300_run_tcl_render(GLcontext *ctx, if (RADEON_DEBUG & DEBUG_PRIMS) fprintf(stderr, "%s\n", __FUNCTION__); + if(hw_tcl_on == GL_FALSE) + return GL_TRUE; + if(ctx->VertexProgram._Enabled == GL_FALSE){ + _tnl_UpdateFixedFunctionProgram(ctx); + r300ProgramStringNotify(ctx, GL_VERTEX_PROGRAM_ARB, &ctx->_TnlProgram); + } return r300_run_vb_render(ctx, stage); } @@ -765,12 +771,6 @@ static void r300_check_tcl_render(GLcontext *ctx, struct tnl_pipeline_stage *sta //stage->active = GL_FALSE; return; } - if(VERTPROG_ACTIVE(ctx)) { - //stage->active = GL_TRUE; - //stage->inputs = ctx->VertexProgram.Current->InputsRead; - } else { - //stage->active = GL_FALSE; - } } const struct tnl_pipeline_stage _r300_tcl_stage = { |