diff options
Diffstat (limited to 'src/mesa/main/vtxfmt.c')
-rw-r--r-- | src/mesa/main/vtxfmt.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c index b9e3f2ef60..4f9a7c0e24 100644 --- a/src/mesa/main/vtxfmt.c +++ b/src/mesa/main/vtxfmt.c @@ -1,9 +1,8 @@ - /* * Mesa 3-D graphics library - * Version: 4.1 + * Version: 6.1 * - * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2004 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"), @@ -72,7 +71,8 @@ -static void install_vtxfmt( struct _glapi_table *tab, GLvertexformat *vfmt ) +static void +install_vtxfmt( struct _glapi_table *tab, const GLvertexformat *vfmt ) { tab->ArrayElement = vfmt->ArrayElement; tab->Color3f = vfmt->Color3f; @@ -136,7 +136,7 @@ static void install_vtxfmt( struct _glapi_table *tab, GLvertexformat *vfmt ) tab->DrawRangeElements = vfmt->DrawRangeElements; tab->EvalMesh1 = vfmt->EvalMesh1; tab->EvalMesh2 = vfmt->EvalMesh2; - assert(tab->EvalMesh2); + ASSERT(tab->EvalMesh2); } @@ -147,13 +147,14 @@ void _mesa_init_exec_vtxfmt( GLcontext *ctx ) } -void _mesa_install_exec_vtxfmt( GLcontext *ctx, GLvertexformat *vfmt ) +void _mesa_install_exec_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt ) { ctx->TnlModule.Current = vfmt; _mesa_restore_exec_vtxfmt( ctx ); } -void _mesa_install_save_vtxfmt( GLcontext *ctx, GLvertexformat *vfmt ) + +void _mesa_install_save_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt ) { install_vtxfmt( ctx->Save, vfmt ); } |