omit X point/line/triangle routines

diff --git a/src/mesa/pipe/xlib/xm_api.c b/src/mesa/pipe/xlib/xm_api.c
index 08c98eab4863f2273c2b4c88a02d43b4a04ecea8..3632390364add02d75322db558c4b47b540b643d 100644 (file)
--- a/src/mesa/pipe/xlib/xm_api.c
+++ b/src/mesa/pipe/xlib/xm_api.c
@@ -1615,9 +1615,10 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
    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 ) );

diff --git a/src/mesa/pipe/xlib/xm_dd.c b/src/mesa/pipe/xlib/xm_dd.c
index 8ae243ae6628556a1c2763f66caf8d0a575d993f..88ac0e594f80699268753d8e8a127e444fb5c756 100644 (file)
--- a/src/mesa/pipe/xlib/xm_dd.c
+++ b/src/mesa/pipe/xlib/xm_dd.c
@@ -1121,6 +1121,7 @@ xmesa_init_driver_functions( XMesaVisual xmvisual,
                             _SWRAST_NEW_RASTERMASK)
 
 
+#if 0
 /**
  * Extend the software rasterizer with our line/point/triangle
  * functions.
@@ -1139,3 +1140,4 @@ void xmesa_register_swrast_functions( GLcontext *ctx )
    swrast->InvalidateLineMask |= XMESA_NEW_LINE;
    swrast->InvalidateTriangleMask |= XMESA_NEW_TRIANGLE;
 }
+#endif

diff --git a/src/mesa/sources b/src/mesa/sources
index 312e48499ebfd1250e56e289d2ed3312b07c6e79..c5c07cf442cce3b652f0465087f1dc47edae2b2e 100644 (file)
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -334,11 +334,9 @@ X11_DRIVER_SOURCES =               \
        pipe/xlib/xm_api.c      \
        pipe/xlib/xm_buffer.c   \
        pipe/xlib/xm_dd.c       \
-       pipe/xlib/xm_line.c     \
        pipe/xlib/xm_winsys.c   \
        pipe/xlib/xm_span.c     \
-       pipe/xlib/xm_surface.c  \
-       pipe/xlib/xm_tri.c
+       pipe/xlib/xm_surface.c
 
 OSMESA_DRIVER_SOURCES = \
        drivers/osmesa/osmesa.c