Mesa (master): xlib: plug in more meta functions, if TEST_META_FUNCS is set
Brian Paul
brianp at kemper.freedesktop.org
Tue Sep 1 03:17:56 UTC 2009
Module: Mesa
Branch: master
Commit: ae5d78198f35941046b238712d70091cb94be44e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ae5d78198f35941046b238712d70091cb94be44e
Author: Brian Paul <brianp at vmware.com>
Date: Mon Aug 31 21:14:50 2009 -0600
xlib: plug in more meta functions, if TEST_META_FUNCS is set
---
src/mesa/drivers/x11/xm_dd.c | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c
index 7ee88e8..465a40a 100644
--- a/src/mesa/drivers/x11/xm_dd.c
+++ b/src/mesa/drivers/x11/xm_dd.c
@@ -1148,23 +1148,25 @@ xmesa_init_driver_functions( XMesaVisual xmvisual,
driver->IndexMask = index_mask;
driver->ColorMask = color_mask;
driver->Enable = enable;
- if (TEST_META_FUNCS)
- driver->Clear = _mesa_meta_clear;
- else
- driver->Clear = clear_buffers;
driver->Viewport = xmesa_viewport;
-#ifndef XFree86Server
- driver->CopyPixels = xmesa_CopyPixels;
if (TEST_META_FUNCS) {
+ driver->Clear = _mesa_meta_clear;
+ driver->CopyPixels = _mesa_meta_copy_pixels;
+ driver->BlitFramebuffer = _mesa_meta_blit_framebuffer;
driver->DrawPixels = _mesa_meta_draw_pixels;
}
- else if (xmvisual->undithered_pf == PF_8R8G8B &&
- xmvisual->dithered_pf == PF_8R8G8B &&
- xmvisual->BitsPerPixel == 32) {
- driver->DrawPixels = xmesa_DrawPixels_8R8G8B;
- }
- else if (xmvisual->undithered_pf == PF_5R6G5B) {
- driver->DrawPixels = xmesa_DrawPixels_5R6G5B;
+ else {
+ driver->Clear = clear_buffers;
+#ifndef XFree86Server
+ driver->CopyPixels = xmesa_CopyPixels;
+ if (xmvisual->undithered_pf == PF_8R8G8B &&
+ xmvisual->dithered_pf == PF_8R8G8B &&
+ xmvisual->BitsPerPixel == 32) {
+ driver->DrawPixels = xmesa_DrawPixels_8R8G8B;
+ }
+ else if (xmvisual->undithered_pf == PF_5R6G5B) {
+ driver->DrawPixels = xmesa_DrawPixels_5R6G5B;
+ }
}
#endif
driver->TestProxyTexImage = test_proxy_teximage;
More information about the mesa-commit
mailing list