rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity
100a748b27
xorg-x11-server/ppc.diff

208 lines
7.8 KiB
Diff
Raw Blame History

diff -u -r -p xorg-server-1.4.99.905.orig//Xext/panoramiX.c xorg-server-1.4.99.905/Xext/panoramiX.c
--- xorg-server-1.4.99.905.orig//Xext/panoramiX.c 2008-06-30 20:11:03.000000000 +0000
+++ xorg-server-1.4.99.905/Xext/panoramiX.c 2008-07-10 10:31:28.675430884 +0000
@@ -1099,14 +1099,8 @@ ProcPanoramiXDispatch (ClientPtr client)
return BadRequest;
}
-
-#if X_BYTE_ORDER == X_LITTLE_ENDIAN
-#define SHIFT_L(v,s) (v) << (s)
-#define SHIFT_R(v,s) (v) >> (s)
-#else
#define SHIFT_L(v,s) (v) >> (s)
#define SHIFT_R(v,s) (v) << (s)
-#endif
static void
CopyBits(char *dst, int shiftL, char *src, int bytes)
diff -u -r -p xorg-server-1.4.99.905.orig//dix/colormap.c xorg-server-1.4.99.905/dix/colormap.c
--- xorg-server-1.4.99.905.orig//dix/colormap.c 2008-06-17 18:41:48.000000000 +0000
+++ xorg-server-1.4.99.905/dix/colormap.c 2008-07-10 10:31:28.765431880 +0000
@@ -281,9 +281,6 @@ CreateColormap (Colormap mid, ScreenPtr
#if defined(_XSERVER64)
pmap->pad0 = 0;
pmap->pad1 = 0;
-#if (X_BYTE_ORDER == X_LITTLE_ENDIAN)
- pmap->pad2 = 0;
-#endif
#endif
pmap->red = (EntryPtr)((char *)pmap + sizeof(ColormapRec));
sizebytes = size * sizeof(Entry);
diff -u -r -p xorg-server-1.4.99.905.orig//glx/glxdri.c xorg-server-1.4.99.905/glx/glxdri.c
--- xorg-server-1.4.99.905.orig//glx/glxdri.c 2008-06-26 21:14:44.000000000 +0000
+++ xorg-server-1.4.99.905/glx/glxdri.c 2008-07-10 10:31:29.025434759 +0000
@@ -465,9 +465,7 @@ nooverride:
bpp = 4;
format = GL_BGRA;
type =
-#if X_BYTE_ORDER == X_BIG_ENDIAN
!override ? GL_UNSIGNED_INT_8_8_8_8_REV :
-#endif
GL_UNSIGNED_BYTE;
} else {
bpp = 2;
diff -u -r -p xorg-server-1.4.99.905.orig//hw/xfree86/common/xf86xv.c xorg-server-1.4.99.905/hw/xfree86/common/xf86xv.c
--- xorg-server-1.4.99.905.orig//hw/xfree86/common/xf86xv.c 2008-06-17 18:41:48.000000000 +0000
+++ xorg-server-1.4.99.905/hw/xfree86/common/xf86xv.c 2008-07-10 10:31:28.965434095 +0000
@@ -2013,29 +2013,18 @@ xf86XVCopyYUV12ToPacked(
Y = srcy; V = srcv; U = srcu;
i = w;
while (i >= 4) {
-#if X_BYTE_ORDER == X_LITTLE_ENDIAN
- Dst[0] = Y[0] | (Y[1] << 16) | (U[0] << 8) | (V[0] << 24);
- Dst[1] = Y[2] | (Y[3] << 16) | (U[1] << 8) | (V[1] << 24);
- Dst[2] = Y[4] | (Y[5] << 16) | (U[2] << 8) | (V[2] << 24);
- Dst[3] = Y[6] | (Y[7] << 16) | (U[3] << 8) | (V[3] << 24);
-#else
/* This assumes a little-endian framebuffer */
Dst[0] = (Y[0] << 24) | (Y[1] << 8) | (U[0] << 16) | V[0];
Dst[1] = (Y[2] << 24) | (Y[3] << 8) | (U[1] << 16) | V[1];
Dst[2] = (Y[4] << 24) | (Y[5] << 8) | (U[2] << 16) | V[2];
Dst[3] = (Y[6] << 24) | (Y[7] << 8) | (U[3] << 16) | V[3];
-#endif
Dst += 4; Y += 8; V += 4; U += 4;
i -= 4;
}
while (i--) {
-#if X_BYTE_ORDER == X_LITTLE_ENDIAN
- Dst[0] = Y[0] | (Y[1] << 16) | (U[0] << 8) | (V[0] << 24);
-#else
/* This assumes a little-endian framebuffer */
Dst[0] = (Y[0] << 24) | (Y[1] << 8) | (U[0] << 16) | V[0];
-#endif
Dst++; Y += 2; V++; U++;
}
diff -u -r -p xorg-server-1.4.99.905.orig//hw/xfree86/int10/generic.c xorg-server-1.4.99.905/hw/xfree86/int10/generic.c
--- xorg-server-1.4.99.905.orig//hw/xfree86/int10/generic.c 2008-06-17 18:41:48.000000000 +0000
+++ xorg-server-1.4.99.905/hw/xfree86/int10/generic.c 2008-07-10 10:31:28.915433541 +0000
@@ -449,20 +449,12 @@ read_b(xf86Int10InfoPtr pInt, int addr)
static CARD16
read_w(xf86Int10InfoPtr pInt, int addr)
{
-#if X_BYTE_ORDER == X_LITTLE_ENDIAN
- if (OFF(addr + 1) > 0)
- return V_ADDR_RW(addr);
-#endif
return V_ADDR_RB(addr) | (V_ADDR_RB(addr + 1) << 8);
}
static CARD32
read_l(xf86Int10InfoPtr pInt, int addr)
{
-#if X_BYTE_ORDER == X_LITTLE_ENDIAN
- if (OFF(addr + 3) > 2)
- return V_ADDR_RL(addr);
-#endif
return V_ADDR_RB(addr) |
(V_ADDR_RB(addr + 1) << 8) |
(V_ADDR_RB(addr + 2) << 16) |
@@ -478,10 +470,6 @@ write_b(xf86Int10InfoPtr pInt, int addr,
static void
write_w(xf86Int10InfoPtr pInt, int addr, CARD16 val)
{
-#if X_BYTE_ORDER == X_LITTLE_ENDIAN
- if (OFF(addr + 1) > 0)
- { V_ADDR_WW(addr, val); }
-#endif
V_ADDR_WB(addr, val);
V_ADDR_WB(addr + 1, val >> 8);
}
@@ -489,10 +477,6 @@ write_w(xf86Int10InfoPtr pInt, int addr,
static void
write_l(xf86Int10InfoPtr pInt, int addr, CARD32 val)
{
-#if X_BYTE_ORDER == X_LITTLE_ENDIAN
- if (OFF(addr + 3) > 2)
- { V_ADDR_WL(addr, val); }
-#endif
V_ADDR_WB(addr, val);
V_ADDR_WB(addr + 1, val >> 8);
V_ADDR_WB(addr + 2, val >> 16);
diff -u -r -p xorg-server-1.4.99.905.orig//hw/xfree86/modes/xf86Cursors.c xorg-server-1.4.99.905/hw/xfree86/modes/xf86Cursors.c
--- xorg-server-1.4.99.905.orig//hw/xfree86/modes/xf86Cursors.c 2008-06-30 20:11:03.000000000 +0000
+++ xorg-server-1.4.99.905/hw/xfree86/modes/xf86Cursors.c 2008-07-10 10:31:28.915433541 +0000
@@ -137,6 +137,7 @@ cursor_bitpos (int flags, int x, Bool ma
mask = !mask;
if (flags & HARDWARE_CURSOR_NIBBLE_SWAPPED)
x = (x & ~3) | (3 - (x & 3));
+#define X_BYTE_ORDER X_BIG_ENDIAN
if (((flags & HARDWARE_CURSOR_BIT_ORDER_MSBFIRST) == 0) ==
(X_BYTE_ORDER == X_BIG_ENDIAN))
x = (x & ~7) | (7 - (x & 7));
diff -u -r -p xorg-server-1.4.99.905.orig//hw/xfree86/vbe/vbe.c xorg-server-1.4.99.905/hw/xfree86/vbe/vbe.c
--- xorg-server-1.4.99.905.orig//hw/xfree86/vbe/vbe.c 2008-06-17 18:41:48.000000000 +0000
+++ xorg-server-1.4.99.905/hw/xfree86/vbe/vbe.c 2008-07-10 10:31:28.925433652 +0000
@@ -23,14 +23,9 @@
#define VERSION(x) VBE_VERSION_MAJOR(x),VBE_VERSION_MINOR(x)
-#if X_BYTE_ORDER == X_LITTLE_ENDIAN
-#define B_O16(x) (x)
-#define B_O32(x) (x)
-#else
#define B_O16(x) ((((x) & 0xff) << 8) | (((x) & 0xff) >> 8))
#define B_O32(x) ((((x) & 0xff) << 24) | (((x) & 0xff00) << 8) \
| (((x) & 0xff0000) >> 8) | (((x) & 0xff000000) >> 24))
-#endif
#define L_ADD(x) (B_O32(x) & 0xffff) + ((B_O32(x) >> 12) & 0xffff00)
#define FARP(p) (((unsigned)(p & 0xffff0000) >> 12) | (p & 0xffff))
diff -u -r -p xorg-server-1.4.99.905.orig//hw/xfree86/xaa/xaaPCache.c xorg-server-1.4.99.905/hw/xfree86/xaa/xaaPCache.c
--- xorg-server-1.4.99.905.orig//hw/xfree86/xaa/xaaPCache.c 2008-06-17 18:41:48.000000000 +0000
+++ xorg-server-1.4.99.905/hw/xfree86/xaa/xaaPCache.c 2008-07-10 10:31:28.895433320 +0000
@@ -1081,21 +1081,12 @@ XAAInitPixmapCache(
CACHEINIT(pScrn) = 1;
}
-#if X_BYTE_ORDER == X_BIG_ENDIAN
static CARD32 StippleMasks[4] = {
0x80808080,
0xC0C0C0C0,
0x00000000,
0xF0F0F0F0
};
-#else
-static CARD32 StippleMasks[4] = {
- 0x01010101,
- 0x03030303,
- 0x00000000,
- 0x0F0F0F0F
-};
-#endif
Bool
XAACheckStippleReducibility(PixmapPtr pPixmap)
diff -u -r -p xorg-server-1.4.99.905.orig//hw/xfree86/xaa/xaacexp.h xorg-server-1.4.99.905/hw/xfree86/xaa/xaacexp.h
--- xorg-server-1.4.99.905.orig//hw/xfree86/xaa/xaacexp.h 2008-04-10 18:58:01.000000000 +0000
+++ xorg-server-1.4.99.905/hw/xfree86/xaa/xaacexp.h 2008-07-10 10:31:28.895433320 +0000
@@ -12,13 +12,8 @@
#define CHECKRETURN(b) if(width <= ((b) * 32)) return(base)
#endif
-#if X_BYTE_ORDER == X_BIG_ENDIAN
# define SHIFT_L(value, shift) ((value) >> (shift))
# define SHIFT_R(value, shift) ((value) << (shift))
-#else
-# define SHIFT_L(value, shift) ((value) << (shift))
-# define SHIFT_R(value, shift) ((value) >> (shift))
-#endif
#ifndef MSBFIRST
# ifdef FIXEDBASE
diff -u -r -p xorg-server-1.4.99.905.orig//include/colormapst.h xorg-server-1.4.99.905/include/colormapst.h
--- xorg-server-1.4.99.905.orig//include/colormapst.h 2008-06-17 18:41:48.000000000 +0000
+++ xorg-server-1.4.99.905/include/colormapst.h 2008-07-10 10:31:29.035434870 +0000
@@ -108,9 +108,6 @@ typedef struct _ColormapRec
XID pad1;
#endif
XID mid; /* client's name for colormap */
-#if defined(_XSERVER64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN)
- XID pad2;
-#endif
ScreenPtr pScreen; /* screen map is associated with */
short flags; /* 1 = IsDefault
* 2 = AllAllocated */
View Git Blame Copy Permalink