1 files changed, 13 insertions, 3 deletions
diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c
index cda4cf2cbd4..ded62aee594 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;