remove tnl/swrast code

diff --git a/src/mesa/pipe/xlib/xm_api.c b/src/mesa/pipe/xlib/xm_api.c
index d13d98857afe6790c45fba31236467c1a679a6c7..16ec304a19fdc693515c4b72ec24d062102d2a98 100644 (file)
--- a/src/mesa/pipe/xlib/xm_api.c
+++ b/src/mesa/pipe/xlib/xm_api.c
@@ -73,16 +73,7 @@
 #include "macros.h"
 #include "renderbuffer.h"
 #include "teximage.h"
-#if 0
-#include "swrast/swrast.h"
-#include "swrast_setup/swrast_setup.h"
-#endif
 #include "vbo/vbo.h"
-#if 0
-#include "tnl/tnl.h"
-#include "tnl/t_context.h"
-#include "tnl/t_pipeline.h"
-#endif
 #include "drivers/common/driverfuncs.h"
 
 #include "state_tracker/st_public.h"
@@ -1597,41 +1588,9 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
    c->display = v->display;
    c->pixelformat = v->dithered_pf;      /* Dithering is enabled by default */
 
-   /* Initialize the software rasterizer and helper modules.
-    */
-#if 0
-   if (!_swrast_CreateContext( mesaCtx )
-#if 0
-       || !_vbo_CreateContext( mesaCtx ) ||
-       !_tnl_CreateContext( mesaCtx ) ||
-       !_swsetup_CreateContext( mesaCtx )
-#endif
-       ) {
-      _mesa_free_context_data(&c->mesa);
-      _mesa_free(c);
-      return NULL;
-   }
-#endif
-
-#if 0
-   /* tnl setup */
-   tnl = TNL_CONTEXT(mesaCtx);
-   tnl->Driver.RunPipeline = _tnl_run_pipeline;
-#endif
-
-#if 0
-   /* swrast setup */
-   xmesa_register_swrast_functions( mesaCtx );
-#endif
-
    st_create_context( mesaCtx,
                       xmesa_create_softpipe( c ) );
 
-#if 0
-   _swsetup_CreateContext( mesaCtx );
-   _swsetup_Wakeup(mesaCtx);
-#endif
-
    /* override these functions, as if the xlib driver were derived from
     * the softpipe driver.
     */
@@ -1661,14 +1620,6 @@ void XMesaDestroyContext( XMesaContext c )
    FXdestroyContext( XMESA_BUFFER(mesaCtx->DrawBuffer) );
 #endif
 
-#if 0
-   _swsetup_DestroyContext( mesaCtx );
-   _swrast_DestroyContext( mesaCtx );
-#endif
-#if 0
-   _tnl_DestroyContext( mesaCtx );
-   _vbo_DestroyContext( mesaCtx );
-#endif
    _mesa_free_context_data( mesaCtx );
    _mesa_free( c );
 }

diff --git a/src/mesa/pipe/xlib/xm_span.c b/src/mesa/pipe/xlib/xm_span.c
index ce54a18a27346dec1030bd9441ea0b970559e736..89eeff5d9d9c493ad24dafc716439be14d965ea1 100644 (file)
--- a/src/mesa/pipe/xlib/xm_span.c
+++ b/src/mesa/pipe/xlib/xm_span.c
@@ -34,7 +34,6 @@
 #include "state.h"
 #include "xmesaP.h"
 
-#include "swrast/swrast.h"
 
 
 /*

diff --git a/src/mesa/pipe/xlib/xmesaP.h b/src/mesa/pipe/xlib/xmesaP.h
index 5796fddb168815b3fd352941edc6964527bc9a3a..b7c510280bf462a25a3078e7de70920e451b36e9 100644 (file)
--- a/src/mesa/pipe/xlib/xmesaP.h
+++ b/src/mesa/pipe/xlib/xmesaP.h
@@ -569,17 +569,6 @@ XMESA_BUFFER(GLframebuffer *b)
 }
 
 
-/* Plugged into the software rasterizer.  Try to use internal
- * swrast-style point, line and triangle functions.
- */
-extern void xmesa_choose_point( GLcontext *ctx );
-extern void xmesa_choose_line( GLcontext *ctx );
-extern void xmesa_choose_triangle( GLcontext *ctx );
-
-
-extern void xmesa_register_swrast_functions( GLcontext *ctx );
-
-
 
 #define ENABLE_EXT_texure_compression_s3tc 0 /* SW texture compression */