summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mesa/pipe/xlib/xm_api.c3
-rw-r--r--src/mesa/pipe/xlib/xm_dd.c2
-rw-r--r--src/mesa/sources4
3 files changed, 5 insertions, 4 deletions
diff --git a/src/mesa/pipe/xlib/xm_api.c b/src/mesa/pipe/xlib/xm_api.c
index 08c98eab48..3632390364 100644
--- 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 8ae243ae66..88ac0e594f 100644
--- 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 312e48499e..c5c07cf442 100644
--- 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