From 0c6987df3b9b3a37d201d740d8248c326449835e Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 17 Jun 2008 16:10:51 -0400 Subject: XAA: Disable offscreen pixmaps by default. Say Option "XaaOffscreenPixmaps" to turn them back on. Apropos of bugs #13795 and #15098. But this still isn't correct. --- hw/xfree86/xaa/xaaInitAccel.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c index 40871424a..3b397dc4a 100644 --- a/hw/xfree86/xaa/xaaInitAccel.c +++ b/hw/xfree86/xaa/xaaInitAccel.c @@ -41,7 +41,8 @@ typedef enum { XAAOPT_WRITE_BITMAP, XAAOPT_WRITE_PIXMAP, XAAOPT_PIXMAP_CACHE, - XAAOPT_OFFSCREEN_PIXMAPS + XAAOPT_OFFSCREEN_PIXMAPS, + XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE } XAAOpts; static const OptionInfoRec XAAOptions[] = { @@ -87,6 +88,8 @@ static const OptionInfoRec XAAOptions[] = { OPTV_BOOLEAN, {0}, FALSE }, {XAAOPT_OFFSCREEN_PIXMAPS, "XaaNoOffscreenPixmaps", OPTV_BOOLEAN, {0}, FALSE }, + {XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE, "XaaOffscreenPixmaps", + OPTV_BOOLEAN, {0}, FALSE }, { -1, NULL, OPTV_NONE, {0}, FALSE } }; @@ -525,8 +528,8 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec) #define XAAMSG(s) do { if (serverGeneration == 1) xf86ErrorF(s); } while (0) if((infoRec->Flags & OFFSCREEN_PIXMAPS) && HaveScreenToScreenCopy && - !xf86ReturnOptValBool(options, XAAOPT_OFFSCREEN_PIXMAPS, - FALSE)) { + xf86IsOptionSet(options, XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE)) + { XAAMSG("\tOffscreen Pixmaps\n"); } else { infoRec->Flags &= ~OFFSCREEN_PIXMAPS; -- cgit v1.2.3