fragment program execution

[mesa.git] / src / mesa / tnl / t_context.c

diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c
index 843db0ebd7b07d425949afd29c40d5ff8af3a632..4b5df8ffda6436dc7fa178c90103edb1faafae69 100644 (file)
--- a/src/mesa/tnl/t_context.c
+++ b/src/mesa/tnl/t_context.c
@@ -1,10 +1,10 @@
-/* $Id: t_context.c,v 1.11 2001/01/13 18:28:20 keithw Exp $ */
+/* $Id: t_context.c,v 1.30 2002/10/29 20:29:01 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
  *
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,15 +24,16 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  * Authors:
- *   Keith Whitwell <keithw@valinux.com>
+ *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
 
 #include "glheader.h"
+#include "imports.h"
 #include "macros.h"
 #include "mtypes.h"
-#include "mem.h"
 #include "dlist.h"
+#include "light.h"
 #include "vtxfmt.h"
 
 #include "t_context.h"
@@ -51,8 +52,8 @@ struct immediate *_tnl_CurrentInput = NULL;
 
 
 void
-_tnl_MakeCurrent( GLcontext *ctx, 
-                 GLframebuffer *drawBuffer, 
+_tnl_MakeCurrent( GLcontext *ctx,
+                 GLframebuffer *drawBuffer,
                  GLframebuffer *readBuffer )
 {
 #ifndef THREADS
@@ -70,9 +71,6 @@ install_driver_callbacks( GLcontext *ctx )
    ctx->Driver.MakeCurrent = _tnl_MakeCurrent;
    ctx->Driver.BeginCallList = _tnl_BeginCallList;
    ctx->Driver.EndCallList = _tnl_EndCallList;
-
-   ctx->Driver.RenderTabElts = _tnl_render_tab_elts;
-   ctx->Driver.RenderTabVerts = _tnl_render_tab_verts;
 }
 
 
@@ -84,7 +82,7 @@ _tnl_CreateContext( GLcontext *ctx )
 
    /* Create the TNLcontext structure
     */
-   ctx->swtnl_context = tnl = CALLOC( sizeof(TNLcontext) );
+   ctx->swtnl_context = tnl = (TNLcontext *) CALLOC( sizeof(TNLcontext) );
 
    if (!tnl) {
       return GL_FALSE;
@@ -92,7 +90,7 @@ _tnl_CreateContext( GLcontext *ctx )
 
    /* Initialize the VB.
     */
-   tnl->vb.Size = MAX2( IMM_SIZE, 
+   tnl->vb.Size = MAX2( IMM_SIZE,
                        ctx->Const.MaxArrayLockSize + MAX_CLIPPED_VERTICES);
 
 
@@ -105,17 +103,22 @@ _tnl_CreateContext( GLcontext *ctx )
    _tnl_install_pipeline( ctx, _tnl_default_pipeline );
 
 
-   tnl->NeedProjCoords = GL_TRUE;
-    
+   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_save_vtxfmt( ctx, &tnl->vtxfmt );
-   ctx->Save->CallList = _mesa_save_CallList;  /* fixme */
-   ctx->Save->CallLists = _mesa_save_CallLists;
-   ctx->Save->EvalMesh1 = _mesa_save_EvalMesh1;        /* fixme */
-   ctx->Save->EvalMesh2 = _mesa_save_EvalMesh2;
-   ctx->Save->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 );
+
 
    /* Set a few default values in the driver struct.
     */
@@ -123,6 +126,13 @@ _tnl_CreateContext( GLcontext *ctx )
    ctx->Driver.NeedFlush = FLUSH_UPDATE_CURRENT;
    ctx->Driver.CurrentExecPrimitive = PRIM_OUTSIDE_BEGIN_END;
    ctx->Driver.CurrentSavePrimitive = PRIM_UNKNOWN;
+
+   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;
 }
 
@@ -132,11 +142,10 @@ _tnl_DestroyContext( GLcontext *ctx )
 {
    TNLcontext *tnl = TNL_CONTEXT(ctx);
 
-/*     _tnl_dlist_destroy( ctx ); */
    _tnl_array_destroy( ctx );
    _tnl_imm_destroy( ctx );
-/*     _tnl_eval_destroy( ctx ); */
    _tnl_destroy_pipeline( ctx );
+   _tnl_free_immediate( ctx, tnl->freed_immediate );
 
    FREE(tnl);
    ctx->swtnl_context = 0;
@@ -151,13 +160,14 @@ _tnl_InvalidateState( GLcontext *ctx, GLuint new_state )
    if (new_state & _NEW_ARRAY) {
       struct immediate *IM = TNL_CURRENT_IM(ctx);
       IM->ArrayEltFlags = ~ctx->Array._Enabled;
-      IM->ArrayEltFlush = !ctx->Array.LockCount;
+      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_state_changes |= new_state;
-   tnl->pipeline.build_state_changes |= (new_state & 
+   tnl->pipeline.build_state_changes |= (new_state &
                                         tnl->pipeline.build_state_trigger);
 
    tnl->eval.EvalNewState |= new_state;
@@ -168,7 +178,7 @@ void
 _tnl_wakeup_exec( GLcontext *ctx )
 {
    TNLcontext *tnl = TNL_CONTEXT(ctx);
-   
+
    install_driver_callbacks(ctx);
    ctx->Driver.NeedFlush |= FLUSH_UPDATE_CURRENT;
 
@@ -182,8 +192,13 @@ _tnl_wakeup_exec( GLcontext *ctx )
 
    /* Assume we haven't been getting state updates either:
     */
-   _tnl_InvalidateState( ctx, ~0 ); 
+   _tnl_InvalidateState( ctx, ~0 );
    tnl->pipeline.run_input_changes = ~0;
+
+   if (ctx->Light.ColorMaterialEnabled) {
+      _mesa_update_color_material( ctx, ctx->Current.Attrib[VERT_ATTRIB_COLOR0] );
+   }
+
 }
 
 
@@ -193,12 +208,7 @@ _tnl_wakeup_save_exec( GLcontext *ctx )
    TNLcontext *tnl = TNL_CONTEXT(ctx);
 
    _tnl_wakeup_exec( ctx );
-   _mesa_install_save_vtxfmt( ctx, &tnl->vtxfmt );
-   ctx->Save->CallList = _mesa_save_CallList;  /* fixme */
-   ctx->Save->CallLists = _mesa_save_CallLists;
-   ctx->Save->EvalMesh1 = _mesa_save_EvalMesh1;        /* fixme */
-   ctx->Save->EvalMesh2 = _mesa_save_EvalMesh2;
-   ctx->Save->Begin = _tnl_save_Begin;
+   _mesa_install_save_vtxfmt( ctx, &tnl->save_vtxfmt );
 }
 
 
@@ -206,8 +216,29 @@ void
 _tnl_need_projected_coords( GLcontext *ctx, GLboolean mode )
 {
    TNLcontext *tnl = TNL_CONTEXT(ctx);
-   if (tnl->NeedProjCoords != mode) {
-      tnl->NeedProjCoords = mode;
+   if (tnl->NeedNdcCoords != mode) {
+      tnl->NeedNdcCoords = mode;
       _tnl_InvalidateState( ctx, _NEW_PROJECTION );
    }
 }
+
+void
+_tnl_need_dlist_loopback( GLcontext *ctx, GLboolean 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;
+}
+
+void
+_tnl_isolate_materials( GLcontext *ctx, GLboolean mode )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   tnl->IsolateMaterials = mode;
+}