From 2d01a44c70104d98a9e3de36bd398c70304dc096 Mon Sep 17 00:00:00 2001 From: Søren Sandmann Date: Mon, 6 Feb 2012 10:41:35 -0500 Subject: make it compile --- src/qxl.h | 1 + src/qxl_driver.c | 16 +++------------- src/qxl_image.c | 2 +- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/qxl.h b/src/qxl.h index 3ba8dff..75253d0 100644 --- a/src/qxl.h +++ b/src/qxl.h @@ -213,6 +213,7 @@ struct _qxl_screen_t int enable_image_cache; int enable_fallback_cache; int enable_surfaces; + int enable_fallback_debug; #ifdef XSPICE /* XSpice specific */ diff --git a/src/qxl_driver.c b/src/qxl_driver.c index 03b606d..8dd0bbb 100644 --- a/src/qxl_driver.c +++ b/src/qxl_driver.c @@ -950,7 +950,6 @@ static Bool setup_uxa (qxl_screen_t *qxl, ScreenPtr screen) { ScrnInfoPtr scrn = xf86Screens[screen->myNum]; - Bool enable_fallback_debug; #if HAS_DIXREGISTERPRIVATEKEY if (!dixRegisterPrivateKey(&uxa_pixmap_index, PRIVATE_PIXMAP, 0)) @@ -1010,19 +1009,10 @@ setup_uxa (qxl_screen_t *qxl, ScreenPtr screen) return FALSE; } -#if 0 - uxa_set_fallback_debug(screen, FALSE); -#endif - -#if 0 - if (!uxa_driver_init (screen, qxl->uxa)) - return FALSE; -#endif - - enable_fallback_debug = - xf86ReturnOptValBool (qxl->options, OPTION_ENABLE_FALLBACK_DEBUG, FALSE); + qxl->enable_fallback_debug = + xf86ReturnOptValBool (qxl->options, OPTION_ENABLE_FALLBACK_DEBUG, FALSE); - uxa_screen_set_fallback_debug (screen, enable_fallback_debug); + uxa_set_fallback_debug (screen, qxl->enable_fallback_debug); return TRUE; } diff --git a/src/qxl_image.c b/src/qxl_image.c index 86c5bab..82fb096 100644 --- a/src/qxl_image.c +++ b/src/qxl_image.c @@ -137,7 +137,7 @@ qxl_image_create (qxl_screen_t *qxl, const uint8_t *data, int dest_stride = width * Bpp; int h; - if (!fallback && uxa_get_screen(screen)->fallback_debug) + if (!fallback && qxl->enable_fallback_debug) { ErrorF ("non-fallback at qx_image_create()\n"); ErrorF ("size: %d %d\n", width, height); -- cgit v1.2.3