Clean up install, restore for exec vtxfmts.

4 files changed, 21 insertions, 13 deletions

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index cfd0fcb9270..f27535d9146 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1,4 +1,4 @@
-/* $Id: context.c,v 1.126 2001/03/11 18:49:11 gareth Exp $ */
+/* $Id: context.c,v 1.127 2001/03/11 23:49:20 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -1436,6 +1436,7 @@ _mesa_initialize_context( GLcontext *ctx,
    ctx->SavePrefersFloat = GL_FALSE;
 
    /* Neutral tnl module stuff */
+   _mesa_init_exec_vtxfmt( ctx );
    ctx->TnlModule.Current = NULL;
    ctx->TnlModule.SwapCount = 0;
 
diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c
index 22685e0f376..d5660e8b54f 100644
--- a/src/mesa/main/vtxfmt.c
+++ b/src/mesa/main/vtxfmt.c
@@ -1,4 +1,4 @@
-/* $Id: vtxfmt.c,v 1.2 2001/03/11 18:49:11 gareth Exp $ */
+/* $Id: vtxfmt.c,v 1.3 2001/03/11 23:49:20 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -149,28 +149,33 @@ static void install_vtxfmt( struct _glapi_table *tab, GLvertexformat *vfmt )
 }
 
 
-void _mesa_install_exec_vtxfmt( GLcontext *ctx, GLvertexformat *vfmt )
+void _mesa_init_exec_vtxfmt( GLcontext *ctx )
 {
-   ctx->TnlModule.Current = vfmt;
    install_vtxfmt( ctx->Exec, &neutral_vtxfmt );
-   if (ctx->ExecPrefersFloat != vfmt->prefer_float_colors)
+}
+
+void _mesa_install_exec_vtxfmt( GLcontext *ctx, GLvertexformat *vfmt )
+{
+   struct gl_tnl_module *tnl = &(ctx->TnlModule);
+
+   tnl->Current = vfmt;
+   _mesa_restore_exec_vtxfmt( ctx );
+   if ( ctx->ExecPrefersFloat != vfmt->prefer_float_colors )
       _mesa_loopback_prefer_float( ctx->Exec, vfmt->prefer_float_colors );
 }
 
 void _mesa_install_save_vtxfmt( GLcontext *ctx, GLvertexformat *vfmt )
 {
    install_vtxfmt( ctx->Save, vfmt );
-   if (ctx->SavePrefersFloat != vfmt->prefer_float_colors)
+   if ( ctx->SavePrefersFloat != vfmt->prefer_float_colors )
       _mesa_loopback_prefer_float( ctx->Save, vfmt->prefer_float_colors );
 }
 
-void _mesa_restore_exec_vtxfmt( GLcontext *ctx, GLvertexformat *vfmt )
+void _mesa_restore_exec_vtxfmt( GLcontext *ctx )
 {
    struct gl_tnl_module *tnl = &(ctx->TnlModule);
    GLuint i;
 
-   tnl->Current = vfmt;
-
    /* Restore the neutral tnl module wrapper.
     */
    for ( i = 0 ; i < tnl->SwapCount ; i++ ) {
diff --git a/src/mesa/main/vtxfmt.h b/src/mesa/main/vtxfmt.h
index af80ada7a4c..945457ebd73 100644
--- a/src/mesa/main/vtxfmt.h
+++ b/src/mesa/main/vtxfmt.h
@@ -1,4 +1,4 @@
-/* $Id: vtxfmt.h,v 1.2 2001/03/11 18:49:11 gareth Exp $ */
+/* $Id: vtxfmt.h,v 1.3 2001/03/11 23:49:20 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -31,9 +31,11 @@
 #ifndef _VTXFMT_H_
 #define _VTXFMT_H_
 
+extern void _mesa_init_exec_vtxfmt( GLcontext *ctx );
+
 extern void _mesa_install_exec_vtxfmt( GLcontext *ctx, GLvertexformat *vfmt );
 extern void _mesa_install_save_vtxfmt( GLcontext *ctx, GLvertexformat *vfmt );
 
-extern void _mesa_restore_exec_vtxfmt( GLcontext *ctx, GLvertexformat *vfmt );
+extern void _mesa_restore_exec_vtxfmt( GLcontext *ctx );
 
 #endif
diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c
index 7e359bfd20f..c533e8a7f46 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.13 2001/03/11 18:49:11 gareth Exp $ */
+/* $Id: t_context.c,v 1.14 2001/03/11 23:49:20 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -174,7 +174,7 @@ _tnl_wakeup_exec( GLcontext *ctx )
 
    /* Hook our functions into exec and compile dispatch tables.
     */
-   _mesa_restore_exec_vtxfmt( ctx, &tnl->vtxfmt );
+   _mesa_install_exec_vtxfmt( ctx, &tnl->vtxfmt );
 
    /* Call all appropriate driver callbacks to revive state.
     */