7e4ea6b182
Apply the following patches from NetBSD xsrc/external/mit/xorg-server/dist; thanks to joerg for providing a list of changes to apply. 2009-02-19 20:02 macallan * hw/xfree86/xaa/: xaaFillRect.c (1.2), xaaInitAccel.c (1.2), xaalocal.h (1.2): Actually use scanline image writes to upload images if available 2009-02-09 09:49 plunky * hw/xfree86/os-support/bsd/bsd_mouse.c (1.5): add horizontal mouse-wheel functionality to USB and WSMOUSE drivers 2009-02-02 03:06 christos * hw/xfree86/os-support/: bsd/bsd_mouse.c (1.4), xf86OSmouse.h (1.2): add a SetupMouse proc to condition the fd. Convert NetBSD's SetupAuto to SetupMouse. 2009-01-19 00:54 christos * hw/xfree86/os-support/bsd/bsd_mouse.c (1.3): fix ioctl. 2009-01-13 18:43 christos * hw/xfree86/os-support/bsd/bsd_mouse.c (1.2): Set the mouse event protocol version. (untested, but head will be broken unless I add this).
33 lines
1.1 KiB
Text
33 lines
1.1 KiB
Text
$NetBSD: patch-ak,v 1.3 2009/03/14 11:00:22 apb Exp $
|
|
|
|
Changes from NetBSD xsrc/external/mit/xorg-server/dist/\
|
|
hw/xfree86/xaa/xaaInitAccel.c
|
|
|
|
----------------------------
|
|
revision 1.2
|
|
date: 2009/02/19 20:02:02; author: macallan; state: Exp; lines: +13 -0
|
|
Actually use scanline image writes to upload images if available
|
|
----------------------------
|
|
|
|
--- hw/xfree86/xaa/xaaInitAccel.c.orig 2009-03-14 11:23:10.000000000 +0200
|
|
+++ hw/xfree86/xaa/xaaInitAccel.c
|
|
@@ -821,6 +821,19 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoR
|
|
infoRec->FillImageWriteRectsFlags = infoRec->ImageWriteFlags;
|
|
}
|
|
|
|
+ /**** FillScanlineImageWriteRects ****/
|
|
+
|
|
+ if(!infoRec->FillImageWriteRects) {
|
|
+ if(HaveScanlineImageWriteRect &&
|
|
+ (infoRec->ScanlineImageWriteFlags &
|
|
+ LEFT_EDGE_CLIPPING_NEGATIVE_X) &&
|
|
+ (infoRec->ScanlineImageWriteFlags & LEFT_EDGE_CLIPPING)) {
|
|
+ infoRec->FillImageWriteRects = XAAFillScanlineImageWriteRects;
|
|
+ infoRec->FillImageWriteRectsFlags =
|
|
+ infoRec->ScanlineImageWriteFlags;
|
|
+ }
|
|
+ }
|
|
+
|
|
/**** WriteBitmap ****/
|
|
|
|
if(infoRec->WriteBitmap &&
|