Split driver struct into swrast/tnl/core components.

1 files changed, 8 insertions, 5 deletions

diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index abbec2d7dd..96dfc4bfe4 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -1,4 +1,4 @@
-/* $Id: xm_api.c,v 1.18 2001/03/08 15:23:46 brianp Exp $ */
+/* $Id: xm_api.c,v 1.19 2001/03/19 02:25:36 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -1659,10 +1659,6 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
    c->driContextPriv = driContextPriv;
 #endif
 
-   /* Set up some constant pointers:
-    */
-   xmesa_init_pointers( ctx );
-
    /* Initialize the software rasterizer and helper modules.
     */
    _swrast_CreateContext( ctx );
@@ -1672,6 +1668,11 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
 
    xmesa_register_swrast_functions( ctx );
 
+   /* Set up some constant pointers:
+    */
+   xmesa_init_pointers( ctx );
+
+
    /* Run the config file
     */
    _mesa_context_initialize( ctx );
@@ -1692,6 +1693,8 @@ void XMesaDestroyContext( XMesaContext c )
    if (c->gl_ctx) {
       _swsetup_DestroyContext( c->gl_ctx );
       _swrast_DestroyContext( c->gl_ctx );
+      _tnl_DestroyContext( c->gl_ctx );
+      _ac_DestroyContext( c->gl_ctx );
       _mesa_destroy_context( c->gl_ctx );
    }