diff options
author | Keith Whitwell <keith@tungstengraphics.com> | 2005-04-22 22:47:09 +0000 |
---|---|---|
committer | Keith Whitwell <keith@tungstengraphics.com> | 2005-04-22 22:47:09 +0000 |
commit | 0d4af83f252d51f504b7df59a9fab7f83672b9ba (patch) | |
tree | 49c2211bfae64229ef62aaab6ac086aad4979df9 /src/mesa/drivers/windows/gldirect/dx8/gld_vb_d3d_render_dx8.c | |
parent | bf87f864934e174b3493592d5d107f012aac0842 (diff) |
Updates for pipeline_stage struct changes.
Diffstat (limited to 'src/mesa/drivers/windows/gldirect/dx8/gld_vb_d3d_render_dx8.c')
-rw-r--r-- | src/mesa/drivers/windows/gldirect/dx8/gld_vb_d3d_render_dx8.c | 42 |
1 files changed, 5 insertions, 37 deletions
diff --git a/src/mesa/drivers/windows/gldirect/dx8/gld_vb_d3d_render_dx8.c b/src/mesa/drivers/windows/gldirect/dx8/gld_vb_d3d_render_dx8.c index 0ae9d6c7e5..cafbf4f5c5 100644 --- a/src/mesa/drivers/windows/gldirect/dx8/gld_vb_d3d_render_dx8.c +++ b/src/mesa/drivers/windows/gldirect/dx8/gld_vb_d3d_render_dx8.c @@ -124,7 +124,6 @@ static GLboolean gld_d3d_render_stage_run( TNLcontext *tnl; struct vertex_buffer *VB; - GLuint new_inputs; tnl_render_func *tab; GLint pass; GLD_pb_dx8 *gldPB = &gld->PB3d; @@ -138,12 +137,11 @@ static GLboolean gld_d3d_render_stage_run( // but we'll test gld->bUseMesaTnL anyway. if (gld->bUseMesaTnL) { // Do nothing in this stage, but continue pipeline - return GL_FALSE; + return GL_TRUE; } tnl = TNL_CONTEXT(ctx); VB = &tnl->vb; - new_inputs = stage->changed_inputs; pass = 0; tnl->Driver.Render.Start( ctx ); @@ -238,43 +236,13 @@ static GLboolean gld_d3d_render_stage_run( //--------------------------------------------------------------------------- -static void gld_d3d_render_stage_check( - GLcontext *ctx, - struct tnl_pipeline_stage *stage) -{ - GLD_context *gldCtx = GLD_GET_CONTEXT(ctx); - GLD_driver_dx8 *gld = GLD_GET_DX8_DRIVER(gldCtx); - // Is this thread safe? - stage->active = (gld->bUseMesaTnL) ? GL_FALSE : GL_TRUE; - return; -} - -//--------------------------------------------------------------------------- - -static void gld_d3d_render_stage_dtr( struct tnl_pipeline_stage *stage ) -{ -} - -//--------------------------------------------------------------------------- - const struct tnl_pipeline_stage _gld_d3d_render_stage = { "gld_d3d_render_stage", - (_NEW_BUFFERS | - _DD_NEW_SEPARATE_SPECULAR | - _DD_NEW_FLATSHADE | - _NEW_TEXTURE| - _NEW_LIGHT| - _NEW_POINT| - _NEW_FOG| - _DD_NEW_TRI_UNFILLED | - _NEW_RENDERMODE), /* re-check (new inputs, interp function) */ - 0, /* re-run (always runs) */ - GL_TRUE, /* active */ - 0, 0, /* inputs (set in check_render), outputs */ - 0, 0, /* changed_inputs, private */ - gld_d3d_render_stage_dtr, /* destructor */ - gld_d3d_render_stage_check, /* check */ + NULL, + NULL, + NULL, + NULL, gld_d3d_render_stage_run /* run */ }; |