diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2005-04-22 12:51:19 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2005-04-22 12:51:19 +0000 |
| commit | 6f973f33679e034b7cb63806f1ddfabdbdd70123 (patch) | |
| tree | 31580bc32d1b87a3dddd8f7c8bc5f404b407c637 /src/mesa/tnl/t_context.c | |
| parent | 6a13c7da4c79f7e811fbddc68f59441070ff0cc8 (diff) | |
Simplify the pipeline_stage structure
- remove input/output fields, input tracking removed.
- remove state fields, the validate function now called
on every statechange.
- add an explicit 'create' function.
Add in code to build vertex program to implement current t&l state. Still
disabled, but turn on with a #define in t_vp_build.h.
Diffstat (limited to 'src/mesa/tnl/t_context.c')
| -rw-r--r-- | src/mesa/tnl/t_context.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c index 531e639e84..ef23784f6a 100644 --- a/src/mesa/tnl/t_context.c +++ b/src/mesa/tnl/t_context.c @@ -124,7 +124,7 @@ _tnl_CreateContext( GLcontext *ctx ) tnl->Driver.Render.PrimTabElts = _tnl_render_tab_elts; tnl->Driver.Render.PrimTabVerts = _tnl_render_tab_verts; tnl->Driver.NotifyMaterialChange = _mesa_validate_all_lighting_tables; - + return GL_TRUE; } @@ -156,16 +156,9 @@ _tnl_InvalidateState( GLcontext *ctx, GLuint new_state ) || !tnl->AllowPixelFog; } - if (new_state & _NEW_ARRAY) { - tnl->pipeline.run_input_changes |= ctx->Array.NewState; /* overkill */ - } - _ae_invalidate_state(ctx, new_state); - tnl->pipeline.run_state_changes |= new_state; - tnl->pipeline.build_state_changes |= (new_state & - tnl->pipeline.build_state_trigger); - + tnl->pipeline.new_state |= new_state; tnl->vtx.eval.new_state |= new_state; /* Calculate tnl->render_inputs: @@ -217,7 +210,6 @@ _tnl_wakeup_exec( GLcontext *ctx ) /* Assume we haven't been getting state updates either: */ _tnl_InvalidateState( ctx, ~0 ); - tnl->pipeline.run_input_changes = ~0; if (ctx->Light.ColorMaterialEnabled) { _mesa_update_color_material( ctx, |