47 lines
1.6 KiB
Diff
47 lines
1.6 KiB
Diff
From a01ca030c7a1f38e411281d888f0acf2c3fb40f3 Mon Sep 17 00:00:00 2001
|
|
From: Adam Jackson <ajax@redhat.com>
|
|
Date: Thu, 13 Mar 2008 13:38:02 -0400
|
|
Subject: [PATCH] Disable XAA offscreen pixmaps by default.
|
|
|
|
Say Option "XaaOffscreenPixmaps" to turn them back on.
|
|
---
|
|
hw/xfree86/xaa/xaaInitAccel.c | 8 ++++++--
|
|
1 files changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c
|
|
index 1b7c154..f3c8f56 100644
|
|
--- a/hw/xfree86/xaa/xaaInitAccel.c
|
|
+++ b/hw/xfree86/xaa/xaaInitAccel.c
|
|
@@ -43,7 +43,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[] = {
|
|
@@ -89,6 +90,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 }
|
|
};
|
|
@@ -532,8 +532,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;
|
|
--
|
|
1.5.4.3
|