|
 |
cb4e7d0 |
From a01ca030c7a1f38e411281d888f0acf2c3fb40f3 Mon Sep 17 00:00:00 2001
|
|
|
cb4e7d0 |
From: Adam Jackson <ajax@redhat.com>
|
|
|
cb4e7d0 |
Date: Thu, 13 Mar 2008 13:38:02 -0400
|
|
|
cb4e7d0 |
Subject: [PATCH] Disable XAA offscreen pixmaps by default.
|
|
|
cb4e7d0 |
|
|
|
cb4e7d0 |
Say Option "XaaOffscreenPixmaps" to turn them back on.
|
|
|
cb4e7d0 |
---
|
|
|
cb4e7d0 |
hw/xfree86/xaa/xaaInitAccel.c | 8 ++++++--
|
|
|
cb4e7d0 |
1 files changed, 6 insertions(+), 2 deletions(-)
|
|
|
cb4e7d0 |
|
|
|
cb4e7d0 |
diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c
|
|
|
cb4e7d0 |
index 1b7c154..f3c8f56 100644
|
|
|
cb4e7d0 |
--- a/hw/xfree86/xaa/xaaInitAccel.c
|
|
|
cb4e7d0 |
+++ b/hw/xfree86/xaa/xaaInitAccel.c
|
|
|
cb4e7d0 |
@@ -43,7 +43,8 @@ typedef enum {
|
|
|
cb4e7d0 |
XAAOPT_WRITE_BITMAP,
|
|
|
cb4e7d0 |
XAAOPT_WRITE_PIXMAP,
|
|
|
cb4e7d0 |
XAAOPT_PIXMAP_CACHE,
|
|
|
cb4e7d0 |
- XAAOPT_OFFSCREEN_PIXMAPS
|
|
|
cb4e7d0 |
+ XAAOPT_OFFSCREEN_PIXMAPS,
|
|
|
cb4e7d0 |
+ XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE
|
|
|
cb4e7d0 |
} XAAOpts;
|
|
|
cb4e7d0 |
|
|
|
cb4e7d0 |
static const OptionInfoRec XAAOptions[] = {
|
|
|
cb4e7d0 |
@@ -89,6 +90,8 @@ static const OptionInfoRec XAAOptions[] = {
|
|
|
cb4e7d0 |
OPTV_BOOLEAN, {0}, FALSE },
|
|
|
cb4e7d0 |
{XAAOPT_OFFSCREEN_PIXMAPS, "XaaNoOffscreenPixmaps",
|
|
|
cb4e7d0 |
OPTV_BOOLEAN, {0}, FALSE },
|
|
|
cb4e7d0 |
+ {XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE, "XaaOffscreenPixmaps",
|
|
|
cb4e7d0 |
+ OPTV_BOOLEAN, {0}, FALSE },
|
|
|
cb4e7d0 |
{ -1, NULL,
|
|
|
cb4e7d0 |
OPTV_NONE, {0}, FALSE }
|
|
|
cb4e7d0 |
};
|
|
Kristian Høgsberg |
d75f107 |
@@ -532,8 +532,8 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
|
|
|
cb4e7d0 |
#define XAAMSG(s) do { if (serverGeneration == 1) xf86ErrorF(s); } while (0)
|
|
|
cb4e7d0 |
|
|
|
cb4e7d0 |
if((infoRec->Flags & OFFSCREEN_PIXMAPS) && HaveScreenToScreenCopy &&
|
|
Kristian Høgsberg |
d75f107 |
- !xf86ReturnOptValBool(options, XAAOPT_OFFSCREEN_PIXMAPS,
|
|
Kristian Høgsberg |
d75f107 |
- FALSE)) {
|
|
|
cb4e7d0 |
+ xf86IsOptionSet(options, XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE))
|
|
|
cb4e7d0 |
+ {
|
|
|
cb4e7d0 |
XAAMSG("\tOffscreen Pixmaps\n");
|
|
|
cb4e7d0 |
} else {
|
|
|
cb4e7d0 |
infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
|
|
|
cb4e7d0 |
--
|
|
|
cb4e7d0 |
1.5.4.3
|