xserver: Branch 'master'

[Michel Daenzer]

 hw/xfree86/modes/xf86Cursors.c |    2 --
 1 files changed, 2 deletions(-)

New commits:
diff-tree 0f057ebb272f0ee0b51b9ab37d4b07da0924fec4 (from 5b424b562eee863b11571de4cd0019cd9bc5b379)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Wed Jul 25 17:04:04 2007 +0200

    Fix RandR 1.2 conversion of two colour to ARGB cursor on MSB first platforms.
    
    Doesn't seem necessary to do anything here...

diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c
index 396bf30..8eaa0ba 100644
--- a/hw/xfree86/modes/xf86Cursors.c
+++ b/hw/xfree86/modes/xf86Cursors.c
@@ -137,8 +137,6 @@ cursor_bitpos (int flags, int x, Bool ma
 	mask = !mask;
     if (flags & HARDWARE_CURSOR_NIBBLE_SWAPPED)
 	x = (x & ~3) | (3 - (x & 3));
-    if (flags & HARDWARE_CURSOR_BIT_ORDER_MSBFIRST)
-	x = (x & ~7) | (7 - (x & 7));
     if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1)
 	x = (x << 1) + mask;
     else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_8)