Clean up install, restore for exec vtxfmts.

This commit is contained in:
Gareth Hughes 2001-03-11 23:49:20 +00:00
parent d8aa0269cd
commit de6a2e0d19
4 changed files with 21 additions and 13 deletions

View file

@ -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;

View file

@ -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_init_exec_vtxfmt( GLcontext *ctx )
{
install_vtxfmt( ctx->Exec, &neutral_vtxfmt );
}
void _mesa_install_exec_vtxfmt( GLcontext *ctx, GLvertexformat *vfmt )
{
ctx->TnlModule.Current = vfmt;
install_vtxfmt( ctx->Exec, &neutral_vtxfmt );
if (ctx->ExecPrefersFloat != vfmt->prefer_float_colors)
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++ ) {

View file

@ -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

View file

@ -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.
*/