summaryrefslogtreecommitdiff
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@tungstengraphics.com>2003-12-04 20:10:54 +0000
committerAlan Hourihane <alanh@tungstengraphics.com>2003-12-04 20:10:54 +0000
commitddd3fad6e510a765bbbdd1406d9100d753e3dc2b (patch)
tree1027c5b8084db56265cdbac92a16cfb9352488b5 /src/mesa/drivers
parente78dd78e4af644fbad6cd8f3135ec7364bd54a5f (diff)
use _swrast_CopyPixels for XFree86
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/x11/xm_dd.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c
index f88ca83494..58b0db1ed1 100644
--- a/src/mesa/drivers/x11/xm_dd.c
+++ b/src/mesa/drivers/x11/xm_dd.c
@@ -907,7 +907,6 @@ xmesa_DrawPixels_5R6G5B( GLcontext *ctx,
format, type, unpack, pixels);
}
}
-#endif /* XFree86Server */
@@ -950,6 +949,7 @@ xmesa_CopyPixels( GLcontext *ctx,
_swrast_CopyPixels(ctx, srcx, srcy, width, height, destx, desty, type );
}
}
+#endif /* XFree86Server */
@@ -1116,10 +1116,11 @@ void xmesa_init_pointers( GLcontext *ctx )
ctx->Driver.Bitmap = _swrast_Bitmap;
ctx->Driver.Clear = clear_buffers;
ctx->Driver.ResizeBuffers = xmesa_resize_buffers;
- ctx->Driver.CopyPixels = xmesa_CopyPixels;
#ifdef XFree86Server
ctx->Driver.DrawPixels = _swrast_DrawPixels;
+ ctx->Driver.CopyPixels = _swrast_CopyPixels;
#else
+ ctx->Driver.CopyPixels = xmesa_CopyPixels;
if (xmesa->xm_visual->undithered_pf == PF_8R8G8B &&
xmesa->xm_visual->dithered_pf == PF_8R8G8B) {
ctx->Driver.DrawPixels = xmesa_DrawPixels_8R8G8B;