fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 11:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix segmentation fault in _tnl_ProgramCacheDestroy().

Browse source
This commit is contained in:
Aapo Tahkola 2005-11-01 15:43:06 +00:00
parent da70bc6baa
commit 3cf156df2b
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/mesa/tnl/t_context.c
View file

@ -87,10 +87,19 @@ _tnl_CreateContext( GLcontext *ctx )
_tnl_array_init( ctx );
_tnl_vtx_init( ctx );
if (ctx->_MaintainTnlProgram)
if (ctx->_MaintainTnlProgram) {
tnl->vp_cache = MALLOC(sizeof(*tnl->vp_cache));
tnl->vp_cache->size = 5;
tnl->vp_cache->n_items = 0;
tnl->vp_cache->items = MALLOC(tnl->vp_cache->size *
sizeof(*tnl->vp_cache->items));
_mesa_memset(tnl->vp_cache->items, 0, tnl->vp_cache->size *
sizeof(*tnl->vp_cache->items));
_tnl_install_pipeline( ctx, _tnl_vp_pipeline );
else
} else {
_tnl_install_pipeline( ctx, _tnl_default_pipeline );
}
/* Initialize the arrayelt helper
*/
@ -135,7 +144,8 @@ _tnl_DestroyContext( GLcontext *ctx )
_tnl_destroy_pipeline( ctx );
_ae_destroy_context( ctx );
_tnl_ProgramCacheDestroy( ctx );
if (ctx->_MaintainTnlProgram)
_tnl_ProgramCacheDestroy( ctx );
FREE(tnl);
ctx->swtnl_context = NULL;

10
src/mesa/tnl/t_vp_build.c
View file

@ -1479,16 +1479,6 @@ void _tnl_UpdateFixedFunctionProgram( GLcontext *ctx )
key = make_state_key(ctx);
hash = hash_key(key);
if (tnl->vp_cache == NULL) {
tnl->vp_cache = MALLOC(sizeof(*tnl->vp_cache));
tnl->vp_cache->size = 5;
tnl->vp_cache->n_items = 0;
tnl->vp_cache->items = MALLOC(tnl->vp_cache->size *
sizeof(*tnl->vp_cache->items));
_mesa_memset(tnl->vp_cache->items, 0, tnl->vp_cache->size *
sizeof(*tnl->vp_cache->items));
}
/* Look for an already-prepared program for this state:
*/
ctx->_TnlProgram = (struct vertex_program *)