From 208fdac73a9b7f8f511f0ec8eeb5c09d4577b3a4 Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@bitplanet.net>
Date: Mon, 3 May 2010 21:12:46 -0400
Subject: mesa: Only initialize save dispatch table for OpenGL

---
 src/mesa/main/context.c    | 22 ++++++++++------------
 src/mesa/vbo/vbo_context.c |  6 ++++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 196a641bc0..439b6c8df1 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -901,18 +901,6 @@ _mesa_initialize_context_for_api(GLcontext *ctx,
    }
 #endif
    ctx->CurrentDispatch = ctx->Exec;
-
-#if FEATURE_dlist
-   ctx->Save = _mesa_create_save_table();
-   if (!ctx->Save) {
-      _mesa_release_shared_state(ctx, ctx->Shared);
-      free(ctx->Exec);
-      return GL_FALSE;
-   }
-
-   _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
-#endif
-
    /* Neutral tnl module stuff */
    _mesa_init_exec_vtxfmt( ctx ); 
    ctx->TnlModule.Current = NULL;
@@ -930,6 +918,16 @@ _mesa_initialize_context_for_api(GLcontext *ctx,
 
    switch (ctx->API) {
    case API_OPENGL:
+#if FEATURE_dlist
+      ctx->Save = _mesa_create_save_table();
+      if (!ctx->Save) {
+	 _mesa_release_shared_state(ctx, ctx->Shared);
+	 free(ctx->Exec);
+	 return GL_FALSE;
+      }
+
+      _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
+#endif
       break;
    case API_OPENGLES:
       /**
diff --git a/src/mesa/vbo/vbo_context.c b/src/mesa/vbo/vbo_context.c
index e3be39a342..13148fc3e2 100644
--- a/src/mesa/vbo/vbo_context.c
+++ b/src/mesa/vbo/vbo_context.c
@@ -199,7 +199,8 @@ GLboolean _vbo_CreateContext( GLcontext *ctx )
     */
    vbo_exec_init( ctx );
 #if FEATURE_dlist
-   vbo_save_init( ctx );
+   if (ctx->API == API_OPENGL)
+      vbo_save_init( ctx );
 #endif
 
    _math_init_eval();
@@ -233,7 +234,8 @@ void _vbo_DestroyContext( GLcontext *ctx )
 
       vbo_exec_destroy(ctx);
 #if FEATURE_dlist
-      vbo_save_destroy(ctx);
+      if (ctx->API == API_OPENGL)
+         vbo_save_destroy(ctx);
 #endif
       FREE(vbo);
       ctx->swtnl_im = NULL;
-- 
cgit v1.2.3