diff options
| -rw-r--r-- | src/mesa/tnl/t_context.c | 16 | ||||
| -rw-r--r-- | src/mesa/tnl/t_vp_build.c | 10 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c index cda4cf2cbd..ded62aee59 100644 --- a/src/mesa/tnl/t_context.c +++ b/src/mesa/tnl/t_context.c @@ -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; diff --git a/src/mesa/tnl/t_vp_build.c b/src/mesa/tnl/t_vp_build.c index 8e52e7125c..02e5a2aa1b 100644 --- a/src/mesa/tnl/t_vp_build.c +++ b/src/mesa/tnl/t_vp_build.c @@ -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 *) |