diff options
Diffstat (limited to 'src/mesa/tnl/t_context.c')
| -rw-r--r-- | src/mesa/tnl/t_context.c | 62 |
1 files changed, 25 insertions, 37 deletions
diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c index 2aa72c7aee..5036301527 100644 --- a/src/mesa/tnl/t_context.c +++ b/src/mesa/tnl/t_context.c @@ -1,4 +1,4 @@ -/* $Id: t_context.c,v 1.28 2002/08/21 13:05:37 brianp Exp $ */ +/* $Id: t_context.c,v 1.28.2.1 2002/11/19 12:01:29 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -34,15 +34,11 @@ #include "mem.h" #include "dlist.h" #include "light.h" -#include "vtxfmt.h" #include "t_context.h" #include "t_array_api.h" #include "t_eval_api.h" -#include "t_imm_alloc.h" -#include "t_imm_api.h" -#include "t_imm_exec.h" -#include "t_imm_dlist.h" +#include "t_vtx_api.h" #include "t_pipeline.h" #include "tnl.h" @@ -65,12 +61,12 @@ _tnl_MakeCurrent( GLcontext *ctx, static void install_driver_callbacks( GLcontext *ctx ) { - ctx->Driver.NewList = _tnl_NewList; - ctx->Driver.EndList = _tnl_EndList; - ctx->Driver.FlushVertices = _tnl_flush_vertices; + ctx->Driver.NewList = _tnl_NewList; + ctx->Driver.EndList = _tnl_EndList; + ctx->Driver.FlushVertices = _tnl_FlushVertices; ctx->Driver.MakeCurrent = _tnl_MakeCurrent; - ctx->Driver.BeginCallList = _tnl_BeginCallList; - ctx->Driver.EndCallList = _tnl_EndCallList; + ctx->Driver.BeginCallList = _tnl_BeginCallList; + ctx->Driver.EndCallList = _tnl_EndCallList; } @@ -90,8 +86,7 @@ _tnl_CreateContext( GLcontext *ctx ) /* Initialize the VB. */ - tnl->vb.Size = MAX2( IMM_SIZE, - ctx->Const.MaxArrayLockSize + MAX_CLIPPED_VERTICES); + tnl->vb.Size = ctx->Const.MaxArrayLockSize; /* Initialize tnl state and tnl->vtxfmt. @@ -104,20 +99,18 @@ _tnl_CreateContext( GLcontext *ctx ) tnl->NeedNdcCoords = GL_TRUE; - tnl->LoopbackDListCassettes = GL_FALSE; - tnl->CalcDListNormalLengths = GL_TRUE; /* Hook our functions into exec and compile dispatch tables. */ - _mesa_install_exec_vtxfmt( ctx, &tnl->vtxfmt ); +/* _mesa_install_exec_vtxfmt( ctx, &tnl->vtxfmt ); */ - tnl->save_vtxfmt = tnl->vtxfmt; - tnl->save_vtxfmt.CallList = _mesa_save_CallList; - tnl->save_vtxfmt.EvalMesh1 = _mesa_save_EvalMesh1; - tnl->save_vtxfmt.EvalMesh2 = _mesa_save_EvalMesh2; - tnl->save_vtxfmt.Begin = _tnl_save_Begin; +/* tnl->save_vtxfmt = tnl->vtxfmt; */ +/* tnl->save_vtxfmt.CallList = _mesa_save_CallList; */ +/* tnl->save_vtxfmt.EvalMesh1 = _mesa_save_EvalMesh1; */ +/* tnl->save_vtxfmt.EvalMesh2 = _mesa_save_EvalMesh2; */ +/* tnl->save_vtxfmt.Begin = _tnl_save_Begin; */ - _mesa_install_save_vtxfmt( ctx, &tnl->save_vtxfmt ); +/* _mesa_install_save_vtxfmt( ctx, &tnl->save_vtxfmt ); */ /* Set a few default values in the driver struct. @@ -145,7 +138,6 @@ _tnl_DestroyContext( GLcontext *ctx ) _tnl_array_destroy( ctx ); _tnl_imm_destroy( ctx ); _tnl_destroy_pipeline( ctx ); - _tnl_free_immediate( ctx, tnl->freed_immediate ); FREE(tnl); ctx->swtnl_context = 0; @@ -158,12 +150,7 @@ _tnl_InvalidateState( GLcontext *ctx, GLuint new_state ) TNLcontext *tnl = TNL_CONTEXT(ctx); if (new_state & _NEW_ARRAY) { - struct immediate *IM = TNL_CURRENT_IM(ctx); - IM->ArrayEltFlags = ~ctx->Array._Enabled; - IM->ArrayEltFlush = (ctx->Array.LockCount - ? FLUSH_ELT_LAZY : FLUSH_ELT_EAGER); - IM->ArrayEltIncr = ctx->Array.Vertex.Enabled ? 1 : 0; - tnl->pipeline.run_input_changes |= ctx->Array.NewState; /* overkill */ + tnl->pipeline.run_input_changes[0] |= ctx->Array.NewState; } tnl->pipeline.run_state_changes |= new_state; @@ -184,7 +171,7 @@ _tnl_wakeup_exec( GLcontext *ctx ) /* Hook our functions into exec and compile dispatch tables. */ - _mesa_install_exec_vtxfmt( ctx, &tnl->vtxfmt ); +/* _mesa_install_exec_vtxfmt( ctx, &tnl->vtxfmt ); */ /* Call all appropriate driver callbacks to revive state. */ @@ -193,7 +180,8 @@ _tnl_wakeup_exec( GLcontext *ctx ) /* Assume we haven't been getting state updates either: */ _tnl_InvalidateState( ctx, ~0 ); - tnl->pipeline.run_input_changes = ~0; + tnl->pipeline.run_input_changes[0] = ~0; + tnl->pipeline.run_input_changes[1] = ~0; if (ctx->Light.ColorMaterialEnabled) { _mesa_update_color_material( ctx, ctx->Current.Attrib[VERT_ATTRIB_COLOR0] ); @@ -205,10 +193,10 @@ _tnl_wakeup_exec( GLcontext *ctx ) void _tnl_wakeup_save_exec( GLcontext *ctx ) { - TNLcontext *tnl = TNL_CONTEXT(ctx); +/* TNLcontext *tnl = TNL_CONTEXT(ctx); */ _tnl_wakeup_exec( ctx ); - _mesa_install_save_vtxfmt( ctx, &tnl->save_vtxfmt ); +/* _mesa_install_save_vtxfmt( ctx, &tnl->save_vtxfmt ); */ } @@ -225,15 +213,15 @@ _tnl_need_projected_coords( GLcontext *ctx, GLboolean mode ) void _tnl_need_dlist_loopback( GLcontext *ctx, GLboolean mode ) { - TNLcontext *tnl = TNL_CONTEXT(ctx); - tnl->LoopbackDListCassettes = mode; +/* TNLcontext *tnl = TNL_CONTEXT(ctx); */ +/* tnl->LoopbackDListCassettes = mode; */ } void _tnl_need_dlist_norm_lengths( GLcontext *ctx, GLboolean mode ) { - TNLcontext *tnl = TNL_CONTEXT(ctx); - tnl->CalcDListNormalLengths = mode; +/* TNLcontext *tnl = TNL_CONTEXT(ctx); */ +/* tnl->CalcDListNormalLengths = mode; */ } void |