diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2008-03-20 09:18:29 -0400 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2008-05-16 17:20:08 +0300 |
| commit | 2621380cf680941a0423d64d827fb3513545ebf5 (patch) | |
| tree | 53bf156d91a3f9f0a492bcf657a7482d65d7f843 | |
| parent | 9db5401d69f1fab8db4bdd166536a25e4516e231 (diff) | |
Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB
This patch (and not setting HARDWARE_CURSOR_BIT_ORDER_MSBFIRST on big endian
platforms) fixes it for me with the radeon driver and doesn't break intel.
Correct patch this time :)
(cherry picked from commit da973e962d09854b571320dee7dd9569060bc39e)
| -rw-r--r-- | hw/xfree86/modes/xf86Cursors.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c index b5101642b..a7616e0e5 100644 --- a/hw/xfree86/modes/xf86Cursors.c +++ b/hw/xfree86/modes/xf86Cursors.c @@ -137,7 +137,8 @@ cursor_bitpos (int flags, int x, Bool mask) mask = !mask; if (flags & HARDWARE_CURSOR_NIBBLE_SWAPPED) x = (x & ~3) | (3 - (x & 3)); - if (flags & HARDWARE_CURSOR_BIT_ORDER_MSBFIRST) + if (((flags & HARDWARE_CURSOR_BIT_ORDER_MSBFIRST) == 0) == + (X_BYTE_ORDER == X_BIG_ENDIAN)) x = (x & ~7) | (7 - (x & 7)); if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1) x = (x << 1) + mask; |