[cairo-commit] libpixman/src ic.c, 1.25, 1.26 icblt.c, 1.10,
1.11 icbltone.c, 1.11, 1.12 iccompose.c, 1.23, 1.24 icint.h,
1.33, 1.34 icrop.h, 1.12, 1.13 icutil.c, 1.11,
1.12 pixman-xserver-compat.h, 1.5, 1.6
Jeff Muizelaar
commit at pdx.freedesktop.org
Sat Jun 25 15:03:20 PDT 2005
Committed by: jrmuizel
Update of /cvs/cairo/libpixman/src
In directory gabe:/tmp/cvs-serv22269/src
Modified Files:
ic.c icblt.c icbltone.c iccompose.c icint.h icrop.h icutil.c
pixman-xserver-compat.h
Log Message:
2005-06-25 Jeff Muizelaar <jeff at infidigm.net>
* src/ic.c: (fbOver):
* src/icblt.c: (fbBlt), (fbBlt24Line), (fbBlt24), (fbBltOdd),
(fbBltOdd24), (fbBltStip):
* src/icbltone.c: (fbBltOne):
* src/iccompose.c: (fbCombineMaskU), (fbCombineMaskC),
(fbCombineMaskValueC), (fbCombineMaskAlphaC), (fbCombineOverU),
(fbCombineOverC), (fbCombineOverReverseU), (fbCombineOverReverseC),
(fbCombineInU), (fbCombineInC), (fbCombineInReverseU),
(fbCombineInReverseC), (fbCombineOutU), (fbCombineOutC),
(fbCombineOutReverseU), (fbCombineOutReverseC), (fbCombineAtopU),
(fbCombineAtopC), (fbCombineAtopReverseU), (fbCombineAtopReverseC),
(fbCombineXorU), (fbCombineXorC), (fbCombineAddU), (fbCombineAddC),
(fbCombineDisjointGeneralU), (fbCombineDisjointGeneralC),
(fbCombineDisjointOverU), (fbCombineConjointGeneralU),
(fbCombineConjointGeneralC), (fbCombineConjointOverU),
(fbFetch_a8r8g8b8), (fbFetch_x8r8g8b8), (fbFetch_a8b8g8r8),
(fbFetch_x8b8g8r8), (fbFetch_r8g8b8), (fbFetch_b8g8r8),
(fbFetch_r5g6b5), (fbFetch_b5g6r5), (fbFetch_a1r5g5b5),
(fbFetch_x1r5g5b5), (fbFetch_a1b5g5r5), (fbFetch_x1b5g5r5),
(fbFetch_a4r4g4b4), (fbFetch_x4r4g4b4), (fbFetch_a4b4g4r4),
(fbFetch_x4b4g4r4), (fbFetch_a8), (fbFetcha_a8), (fbFetch_r3g3b2),
(fbFetch_b2g3r3), (fbFetch_a2r2g2b2), (fbFetch_a4), (fbFetcha_a4),
(fbFetch_r1g2b1), (fbFetch_b1g2r1), (fbFetch_a1r1g1b1),
(fbFetch_a1b1g1r1), (fbFetcha_a1), (fbFetch_a1),
(fbBuildCompositeOperand), (pixman_compositeGeneral):
* src/icint.h:
* src/icrop.h:
* src/icutil.c:
* src/pixman-xserver-compat.h:
Merge over most of the low-hanging renames from xserver/fb.
Index: ic.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/ic.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- ic.c 25 Jun 2005 03:13:19 -0000 1.25
+++ ic.c 25 Jun 2005 22:03:17 -0000 1.26
@@ -32,30 +32,30 @@
#if IMAGE_BYTE_ORDER == MSBFirst
#define Fetch24(a) ((unsigned long) (a) & 1 ? \
- ((*(a) << 16) | *((uint16_t *) ((a)+1))) : \
- ((*((uint16_t *) (a)) << 8) | *((a)+2)))
+ ((*(a) << 16) | *((CARD16 *) ((a)+1))) : \
+ ((*((CARD16 *) (a)) << 8) | *((a)+2)))
#define Store24(a,v) ((unsigned long) (a) & 1 ? \
- ((*(a) = (uint8_t) ((v) >> 16)), \
- (*((uint16_t *) ((a)+1)) = (uint16_t) (v))) : \
- ((*((uint16_t *) (a)) = (uint16_t) ((v) >> 8)), \
- (*((a)+2) = (uint8_t) (v))))
+ ((*(a) = (CARD8) ((v) >> 16)), \
+ (*((CARD16 *) ((a)+1)) = (CARD16) (v))) : \
+ ((*((CARD16 *) (a)) = (CARD16) ((v) >> 8)), \
+ (*((a)+2) = (CARD8) (v))))
#else
#define Fetch24(a) ((unsigned long) (a) & 1 ? \
- ((*(a)) | (*((uint16_t *) ((a)+1)) << 8)) : \
- ((*((uint16_t *) (a))) | (*((a)+2) << 16)))
+ ((*(a)) | (*((CARD16 *) ((a)+1)) << 8)) : \
+ ((*((CARD16 *) (a))) | (*((a)+2) << 16)))
#define Store24(a,v) ((unsigned long) (a) & 1 ? \
- ((*(a) = (uint8_t) (v)), \
- (*((uint16_t *) ((a)+1)) = (uint16_t) ((v) >> 8))) : \
- ((*((uint16_t *) (a)) = (uint16_t) (v)),\
- (*((a)+2) = (uint8_t) ((v) >> 16))))
+ ((*(a) = (CARD8) (v)), \
+ (*((CARD16 *) ((a)+1)) = (CARD16) ((v) >> 8))) : \
+ ((*((CARD16 *) (a)) = (CARD16) (v)),\
+ (*((a)+2) = (CARD8) ((v) >> 16))))
#endif
static uint32_t
fbOver (uint32_t x, uint32_t y)
{
- uint16_t a = ~x >> 24;
- uint16_t t;
- uint32_t m,n,o,p;
+ CARD16 a = ~x >> 24;
+ CARD16 t;
+ CARD32 m,n,o,p;
m = FbOverU(x,y,0,a,t);
n = FbOverU(x,y,8,a,t);
Index: icblt.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/icblt.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- icblt.c 25 Jun 2005 03:13:19 -0000 1.10
+++ icblt.c 25 Jun 2005 22:03:17 -0000 1.11
@@ -52,15 +52,15 @@
FbBits pm,
int bpp,
- int reverse,
- int upsidedown)
+ Bool reverse,
+ Bool upsidedown)
{
FbBits *src, *dst;
int leftShift, rightShift;
FbBits startmask, endmask;
FbBits bits, bits1;
int n, nmiddle;
- int destInvarient;
+ Bool destInvarient;
int startbyte, endbyte;
FbDeclareMergeRop ();
@@ -361,7 +361,7 @@
int alu,
FbBits pm,
- int reverse)
+ Bool reverse)
{
#ifdef DEBUG_BLT24
char *origDst = (char *) dst;
@@ -578,8 +578,8 @@
int alu,
FbBits pm,
- int reverse,
- int upsidedown)
+ Bool reverse,
+ Bool upsidedown)
{
if (upsidedown)
{
@@ -646,8 +646,8 @@
FbBits bits, bits1;
int n;
- int destInvarient;
- int even;
+ Bool destInvarient;
+ Bool even;
FbDeclareMergeRop ();
FbInitializeMergeRop (alu, pm);
@@ -663,7 +663,7 @@
FbMaskBits(dstXEven, width, startmaskEven, nmiddleEven, endmaskEven);
FbMaskBits(dstXOdd, width, startmaskOdd, nmiddleOdd, endmaskOdd);
- even = 1;
+ even = TRUE;
InitializeShifts(srcXEven, dstXEven, leftShiftEven, rightShiftEven);
InitializeShifts(srcXOdd, dstXOdd, leftShiftOdd, rightShiftOdd);
while (height--)
@@ -681,7 +681,7 @@
rightShift = rightShiftEven;
srcLine += srcStrideEven;
dstLine += dstStrideEven;
- even = 0;
+ even = FALSE;
}
else
{
@@ -694,7 +694,7 @@
rightShift = rightShiftOdd;
srcLine += srcStrideOdd;
dstLine += dstStrideOdd;
- even = 1;
+ even = TRUE;
}
if (srcX == dstX)
{
@@ -799,25 +799,25 @@
int alu,
FbBits pm)
{
- int even = 1;
+ Bool even = TRUE;
while (height--)
{
if (even)
{
fbBlt24Line (srcLine, srcXEven, dstLine, dstXEven,
- width, alu, pm, 0);
+ width, alu, pm, FALSE);
srcLine += srcStrideEven;
dstLine += dstStrideEven;
- even = 0;
+ even = FALSE;
}
else
{
fbBlt24Line (srcLine, srcXOdd, dstLine, dstXOdd,
- width, alu, pm, 0);
+ width, alu, pm, FALSE);
srcLine += srcStrideOdd;
dstLine += dstStrideOdd;
- even = 1;
+ even = TRUE;
}
}
#if 0
@@ -944,6 +944,6 @@
(FbBits *) dst, FbStipStrideToBitsStride (dstStride),
dstX,
width, height,
- alu, pm, bpp, 0, 0);
+ alu, pm, bpp, FALSE, FALSE);
}
}
Index: icbltone.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/icbltone.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- icbltone.c 25 Jun 2005 03:13:19 -0000 1.11
+++ icbltone.c 25 Jun 2005 22:03:17 -0000 1.12
@@ -151,7 +151,7 @@
FbBits bgand,
FbBits bgxor)
{
- const FbBits *icbits;
+ const FbBits *fbBits;
int pixelsPerDst; /* dst pixels per FbBits */
int unitsPerSrc; /* src patterns per FbStip */
int leftShift, rightShift; /* align source with dest */
@@ -163,12 +163,12 @@
int w;
int n, nmiddle;
int dstS; /* stipple-relative dst X coordinate */
- int copy; /* accelerate dest-invariant */
- int transparent; /* accelerate 0 nop */
+ Bool copy; /* accelerate dest-invariant */
+ Bool transparent; /* accelerate 0 nop */
int srcinc; /* source units consumed */
- int endNeedsLoad = 0; /* need load for endmask */
+ Bool endNeedsLoad = FALSE; /* need load for endmask */
#ifndef FBNOPIXADDR
- const uint8_t *fbLane;
+ const CARD8 *fbLane;
#endif
int startbyte, endbyte;
@@ -194,12 +194,12 @@
*/
unitsPerSrc = FB_STIP_UNIT / pixelsPerDst;
- copy = 0;
- transparent = 0;
+ copy = FALSE;
+ transparent = FALSE;
if (bgand == 0 && fgand == 0)
- copy = 1;
+ copy = TRUE;
else if (bgand == FB_ALLONES && bgxor == 0)
- transparent = 1;
+ transparent = TRUE;
/*
* Adjust source and dest to nearest FbBits boundary
@@ -233,9 +233,9 @@
/*
* Get pointer to stipple mask array for this depth
*/
- icbits = 0; /* unused */
+ fbBits = 0; /* unused */
if (pixelsPerDst <= 8)
- icbits = fbStippleTable(pixelsPerDst);
+ fbBits = fbStippleTable(pixelsPerDst);
#ifndef FBNOPIXADDR
fbLane = 0;
if (transparent && fgand == 0 && dstBpp >= 8)
@@ -299,7 +299,7 @@
mask = FbStipple16Bits(FbLeftStipBits(bits,16));
else
#endif
- mask = icbits[FbLeftStipBits(bits,pixelsPerDst)];
+ mask = fbBits[FbLeftStipBits(bits,pixelsPerDst)];
#ifndef FBNOPIXADDR
if (fbLane)
{
@@ -333,7 +333,7 @@
mask = FbStipple16Bits(FbLeftStipBits(bits,16));
else
#endif
- mask = icbits[FbLeftStipBits(bits,pixelsPerDst)];
+ mask = fbBits[FbLeftStipBits(bits,pixelsPerDst)];
*dst = FbOpaqueStipple (mask, fgxor, bgxor);
dst++;
bits = FbStipLeft(bits, pixelsPerDst);
@@ -347,7 +347,7 @@
while (bits && n)
{
switch (fbLane[FbLeftStipBits(bits,pixelsPerDst)]) {
- LaneCases((uint8_t *) dst);
+ LaneCases((CARD8 *) dst);
}
bits = FbStipLeft(bits,pixelsPerDst);
dst++;
@@ -363,7 +363,7 @@
left = FbLeftStipBits(bits,pixelsPerDst);
if (left || !transparent)
{
- mask = icbits[left];
+ mask = fbBits[left];
*dst = FbStippleRRop (*dst, mask,
fgand, fgxor, bgand, bgxor);
}
@@ -397,7 +397,7 @@
mask = FbStipple16Bits(FbLeftStipBits(bits,16));
else
#endif
- mask = icbits[FbLeftStipBits(bits,pixelsPerDst)];
+ mask = fbBits[FbLeftStipBits(bits,pixelsPerDst)];
#ifndef FBNOPIXADDR
if (fbLane)
{
Index: iccompose.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/iccompose.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- iccompose.c 25 Jun 2005 03:13:19 -0000 1.23
+++ iccompose.c 25 Jun 2005 22:03:17 -0000 1.24
@@ -39,10 +39,10 @@
fbCombineMaskU (FbCompositeOperand *src,
FbCompositeOperand *msk)
{
- uint32_t x;
- uint16_t a;
- uint16_t t;
- uint32_t m,n,o,p;
+ CARD32 x;
+ CARD16 a;
+ CARD16 t;
+ CARD32 m,n,o,p;
if (!msk)
return (*src->fetch) (src);
@@ -67,11 +67,11 @@
FbCompositeOperand *msk)
{
FbCompSrc s;
- uint32_t x;
- uint32_t a;
- uint16_t xa;
- uint16_t t;
- uint32_t m,n,o,p;
+ CARD32 x;
+ CARD32 a;
+ CARD16 xa;
+ CARD16 t;
+ CARD32 m,n,o,p;
if (!msk)
{
@@ -121,10 +121,10 @@
fbCombineMaskValueC (FbCompositeOperand *src,
FbCompositeOperand *msk)
{
- uint32_t x;
- uint32_t a;
- uint16_t t;
- uint32_t m,n,o,p;
+ CARD32 x;
+ CARD32 a;
+ CARD16 t;
+ CARD32 m,n,o,p;
if (!msk)
{
@@ -175,10 +175,10 @@
fbCombineMaskAlphaC (FbCompositeOperand *src,
FbCompositeOperand *msk)
{
- uint32_t x;
- uint32_t a;
- uint16_t t;
- uint32_t m,n,o,p;
+ CARD32 x;
+ CARD32 a;
+ CARD16 t;
+ CARD32 m,n,o,p;
if (!msk)
return (*src->fetch) (src);
@@ -238,10 +238,10 @@
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- uint32_t s, d;
- uint16_t a;
- uint16_t t;
- uint32_t m,n,o,p;
+ CARD32 s, d;
+ CARD16 a;
+ CARD16 t;
+ CARD32 m,n,o,p;
s = fbCombineMaskU (src, msk);
a = ~s >> 24;
@@ -266,10 +266,10 @@
FbCompositeOperand *dst)
{
FbCompSrc cs;
- uint32_t s, d;
- uint32_t a;
- uint16_t t;
- uint32_t m,n,o,p;
+ CARD32 s, d;
+ CARD32 a;
+ CARD16 t;
+ CARD32 m,n,o,p;
cs = fbCombineMaskC (src, msk);
s = cs.value;
@@ -294,10 +294,10 @@
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- uint32_t s, d;
- uint16_t a;
- uint16_t t;
- uint32_t m,n,o,p;
+ CARD32 s, d;
+ CARD16 a;
+ CARD16 t;
+ CARD32 m,n,o,p;
d = (*dst->fetch) (dst);
a = ~d >> 24;
@@ -321,10 +321,10 @@
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- uint32_t s, d;
- uint32_t a;
- uint16_t t;
- uint32_t m,n,o,p;
+ CARD32 s, d;
+ CARD32 a;
+ CARD16 t;
+ CARD32 m,n,o,p;
d = (*dst->fetch) (dst);
a = ~d >> 24;
@@ -348,10 +348,10 @@
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- uint32_t s, d;
- uint16_t a;
- uint16_t t;
- uint32_t m,n,o,p;
+ CARD32 s, d;
+ CARD16 a;
+ CARD16 t;
+ CARD32 m,n,o,p;
d = (*dst->fetch) (dst);
a = d >> 24;
@@ -376,10 +376,10 @@
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- uint32_t s, d;
- uint16_t a;
- uint16_t t;
- uint32_t m,n,o,p;
+ CARD32 s, d;
+ CARD16 a;
+ CARD16 t;
+ CARD32 m,n,o,p;
d = (*dst->fetch) (dst);
a = d >> 24;
@@ -404,10 +404,10 @@
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- uint32_t s, d;
- uint16_t a;
- uint16_t t;
- uint32_t m,n,o,p;
+ CARD32 s, d;
+ CARD16 a;
+ CARD16 t;
+ CARD32 m,n,o,p;
s = fbCombineMaskAlphaU (src, msk);
a = s >> 24;
@@ -432,10 +432,10 @@
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- uint32_t s, d;
- uint32_t a;
- uint16_t t;
- uint32_t m,n,o,p;
+ CARD32 s, d;
+ CARD32 a;
+ CARD16 t;
+ CARD32 m,n,o,p;
s = fbCombineMaskAlphaC (src, msk);
a = s;
@@ -460,10 +460,10 @@
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- uint32_t s, d;
- uint16_t a;
- uint16_t t;
- uint32_t m,n,o,p;
+ CARD32 s, d;
+ CARD16 a;
+ CARD16 t;
+ CARD32 m,n,o,p;
d = (*dst->fetch) (dst);
a = ~d >> 24;
@@ -488,10 +488,10 @@
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- uint32_t s, d;
- uint16_t a;
- uint16_t t;
- uint32_t m,n,o,p;
+ CARD32 s, d;
+ CARD16 a;
+ CARD16 t;
+ CARD32 m,n,o,p;
d = (*dst->fetch) (dst);
a = ~d >> 24;
@@ -516,10 +516,10 @@
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- uint32_t s, d;
- uint16_t a;
- uint16_t t;
- uint32_t m,n,o,p;
+ CARD32 s, d;
+ CARD16 a;
+ CARD16 t;
+ CARD32 m,n,o,p;
s = fbCombineMaskAlphaU (src, msk);
a = ~s >> 24;
@@ -544,10 +544,10 @@
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- uint32_t s, d;
- uint32_t a;
- uint16_t t;
- uint32_t m,n,o,p;
+ CARD32 s, d;
+ CARD32 a;
+ CARD16 t;
+ CARD32 m,n,o,p;
s = fbCombineMaskAlphaC (src, msk);
a = ~s;
@@ -572,10 +572,10 @@
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- uint32_t s, d;
- uint16_t ad, as;
- uint16_t t,u,v;
- uint32_t m,n,o,p;
+ CARD32 s, d;
+ CARD16 ad, as;
+ CARD16 t,u,v;
+ CARD32 m,n,o,p;
s = fbCombineMaskU (src, msk);
d = (*dst->fetch) (dst);
@@ -594,11 +594,11 @@
FbCompositeOperand *dst)
{
FbCompSrc cs;
- uint32_t s, d;
- uint32_t ad;
- uint16_t as;
- uint16_t t, u, v;
- uint32_t m,n,o,p;
+ CARD32 s, d;
+ CARD32 ad;
+ CARD16 as;
+ CARD16 t, u, v;
+ CARD32 m,n,o,p;
cs = fbCombineMaskC (src, msk);
d = (*dst->fetch) (dst);
@@ -617,10 +617,10 @@
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- uint32_t s, d;
- uint16_t ad, as;
- uint16_t t, u, v;
- uint32_t m,n,o,p;
+ CARD32 s, d;
+ CARD16 ad, as;
+ CARD16 t, u, v;
+ CARD32 m,n,o,p;
s = fbCombineMaskU (src, msk);
d = (*dst->fetch) (dst);
@@ -639,10 +639,10 @@
FbCompositeOperand *dst)
{
FbCompSrc cs;
- uint32_t s, d, ad;
- uint16_t as;
- uint16_t t, u, v;
- uint32_t m,n,o,p;
+ CARD32 s, d, ad;
+ CARD16 as;
+ CARD16 t, u, v;
+ CARD32 m,n,o,p;
cs = fbCombineMaskC (src, msk);
d = (*dst->fetch) (dst);
@@ -661,10 +661,10 @@
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- uint32_t s, d;
- uint16_t ad, as;
- uint16_t t, u, v;
- uint32_t m,n,o,p;
+ CARD32 s, d;
+ CARD16 ad, as;
+ CARD16 t, u, v;
+ CARD32 m,n,o,p;
s = fbCombineMaskU (src, msk);
d = (*dst->fetch) (dst);
@@ -683,10 +683,10 @@
FbCompositeOperand *dst)
{
FbCompSrc cs;
- uint32_t s, d, ad;
- uint16_t as;
- uint16_t t, u, v;
- uint32_t m,n,o,p;
+ CARD32 s, d, ad;
+ CARD16 as;
+ CARD16 t, u, v;
+ CARD32 m,n,o,p;
cs = fbCombineMaskC (src, msk);
d = (*dst->fetch) (dst);
@@ -705,9 +705,9 @@
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- uint32_t s, d;
- uint16_t t;
- uint32_t m,n,o,p;
+ CARD32 s, d;
+ CARD16 t;
+ CARD32 m,n,o,p;
s = fbCombineMaskU (src, msk);
if (s == ~0)
@@ -731,9 +731,9 @@
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- uint32_t s, d;
- uint16_t t;
- uint32_t m,n,o,p;
+ CARD32 s, d;
+ CARD16 t;
+ CARD32 m,n,o,p;
s = fbCombineMaskValueC (src, msk);
if (s == ~0)
@@ -821,12 +821,12 @@
fbCombineDisjointGeneralU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst,
- uint8_t combine)
+ CARD8 combine)
{
- uint32_t s, d;
- uint32_t m,n,o,p;
- uint16_t Fa, Fb, t, u, v;
- uint8_t sa, da;
+ CARD32 s, d;
+ CARD32 m,n,o,p;
+ CARD16 Fa, Fb, t, u, v;
+ CARD8 sa, da;
s = fbCombineMaskU (src, msk);
sa = s >> 24;
@@ -875,15 +875,15 @@
fbCombineDisjointGeneralC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst,
- uint8_t combine)
+ CARD8 combine)
{
FbCompSrc cs;
- uint32_t s, d;
- uint32_t m,n,o,p;
- uint32_t Fa;
- uint16_t Fb, t, u, v;
- uint32_t sa;
- uint8_t da;
+ CARD32 s, d;
+ CARD32 m,n,o,p;
+ CARD32 Fa;
+ CARD16 Fb, t, u, v;
+ CARD32 sa;
+ CARD8 da;
cs = fbCombineMaskC (src, msk);
s = cs.value;
@@ -897,17 +897,17 @@
Fa = 0;
break;
case CombineAOut:
- m = fbCombineDisjointOutPart ((uint8_t) (sa >> 0), da);
- n = fbCombineDisjointOutPart ((uint8_t) (sa >> 8), da) << 8;
- o = fbCombineDisjointOutPart ((uint8_t) (sa >> 16), da) << 16;
- p = fbCombineDisjointOutPart ((uint8_t) (sa >> 24), da) << 24;
+ m = fbCombineDisjointOutPart ((CARD8) (sa >> 0), da);
+ n = fbCombineDisjointOutPart ((CARD8) (sa >> 8), da) << 8;
+ o = fbCombineDisjointOutPart ((CARD8) (sa >> 16), da) << 16;
+ p = fbCombineDisjointOutPart ((CARD8) (sa >> 24), da) << 24;
Fa = m|n|o|p;
break;
case CombineAIn:
- m = fbCombineDisjointOutPart ((uint8_t) (sa >> 0), da);
- n = fbCombineDisjointOutPart ((uint8_t) (sa >> 8), da) << 8;
- o = fbCombineDisjointOutPart ((uint8_t) (sa >> 16), da) << 16;
- p = fbCombineDisjointOutPart ((uint8_t) (sa >> 24), da) << 24;
+ m = fbCombineDisjointOutPart ((CARD8) (sa >> 0), da);
+ n = fbCombineDisjointOutPart ((CARD8) (sa >> 8), da) << 8;
+ o = fbCombineDisjointOutPart ((CARD8) (sa >> 16), da) << 16;
+ p = fbCombineDisjointOutPart ((CARD8) (sa >> 24), da) << 24;
Fa = m|n|o|p;
break;
case CombineA:
@@ -942,10 +942,10 @@
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- uint32_t s, d;
- uint16_t a;
- uint16_t t;
- uint32_t m,n,o,p;
+ CARD32 s, d;
+ CARD16 a;
+ CARD16 t;
+ CARD32 m,n,o,p;
s = fbCombineMaskU (src, msk);
a = s >> 24;
@@ -1130,12 +1130,12 @@
fbCombineConjointGeneralU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst,
- uint8_t combine)
+ CARD8 combine)
{
- uint32_t s, d;
- uint32_t m,n,o,p;
- uint16_t Fa, Fb, t, u, v;
- uint8_t sa, da;
+ CARD32 s, d;
+ CARD32 m,n,o,p;
+ CARD16 Fa, Fb, t, u, v;
+ CARD8 sa, da;
s = fbCombineMaskU (src, msk);
sa = s >> 24;
@@ -1184,15 +1184,15 @@
fbCombineConjointGeneralC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst,
- uint8_t combine)
+ CARD8 combine)
{
FbCompSrc cs;
- uint32_t s, d;
- uint32_t m,n,o,p;
- uint32_t Fa;
- uint16_t Fb, t, u, v;
- uint32_t sa;
- uint8_t da;
+ CARD32 s, d;
+ CARD32 m,n,o,p;
+ CARD32 Fa;
+ CARD16 Fb, t, u, v;
+ CARD32 sa;
+ CARD8 da;
cs = fbCombineMaskC (src, msk);
s = cs.value;
@@ -1206,17 +1206,17 @@
Fa = 0;
break;
case CombineAOut:
- m = fbCombineConjointOutPart ((uint8_t) (sa >> 0), da);
- n = fbCombineConjointOutPart ((uint8_t) (sa >> 8), da) << 8;
- o = fbCombineConjointOutPart ((uint8_t) (sa >> 16), da) << 16;
- p = fbCombineConjointOutPart ((uint8_t) (sa >> 24), da) << 24;
+ m = fbCombineConjointOutPart ((CARD8) (sa >> 0), da);
+ n = fbCombineConjointOutPart ((CARD8) (sa >> 8), da) << 8;
+ o = fbCombineConjointOutPart ((CARD8) (sa >> 16), da) << 16;
+ p = fbCombineConjointOutPart ((CARD8) (sa >> 24), da) << 24;
Fa = m|n|o|p;
break;
case CombineAIn:
- m = fbCombineConjointOutPart ((uint8_t) (sa >> 0), da);
- n = fbCombineConjointOutPart ((uint8_t) (sa >> 8), da) << 8;
- o = fbCombineConjointOutPart ((uint8_t) (sa >> 16), da) << 16;
- p = fbCombineConjointOutPart ((uint8_t) (sa >> 24), da) << 24;
+ m = fbCombineConjointOutPart ((CARD8) (sa >> 0), da);
+ n = fbCombineConjointOutPart ((CARD8) (sa >> 8), da) << 8;
+ o = fbCombineConjointOutPart ((CARD8) (sa >> 16), da) << 16;
+ p = fbCombineConjointOutPart ((CARD8) (sa >> 24), da) << 24;
Fa = m|n|o|p;
break;
case CombineA:
@@ -1253,10 +1253,10 @@
{
fbCombineConjointGeneralU (src, msk, dst, CombineAOver);
/*
- uint32_t s, d;
- uint16_t a;
- uint16_t t;
- uint32_t m,n,o,p;
+ CARD32 s, d;
+ CARD16 a;
+ CARD16 t;
+ CARD32 m,n,o,p;
s = fbCombineMaskU (src, msk);
a = s >> 24;
@@ -1514,22 +1514,22 @@
static uint32_t
fbFetch_a8r8g8b8 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- return ((uint32_t *)line)[offset >> 5];
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ return ((CARD32 *)line)[offset >> 5];
}
static uint32_t
fbFetch_x8r8g8b8 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- return ((uint32_t *)line)[offset >> 5] | 0xff000000;
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ return ((CARD32 *)line)[offset >> 5] | 0xff000000;
}
static uint32_t
fbFetch_a8b8g8r8 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint32_t pixel = ((uint32_t *)line)[offset >> 5];
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD32 pixel = ((CARD32 *)line)[offset >> 5];
return ((pixel & 0xff000000) |
((pixel >> 16) & 0xff) |
@@ -1540,8 +1540,8 @@
static uint32_t
fbFetch_x8b8g8r8 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint32_t pixel = ((uint32_t *)line)[offset >> 5];
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD32 pixel = ((CARD32 *)line)[offset >> 5];
return ((0xff000000) |
((pixel >> 16) & 0xff) |
@@ -1552,8 +1552,8 @@
static uint32_t
fbFetch_r8g8b8 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint8_t *pixel = ((uint8_t *) line) + (offset >> 3);
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD8 *pixel = ((CARD8 *) line) + (offset >> 3);
#if IMAGE_BYTE_ORDER == MSBFirst
return (0xff000000 |
(pixel[0] << 16) |
@@ -1570,8 +1570,8 @@
static uint32_t
fbFetch_b8g8r8 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint8_t *pixel = ((uint8_t *) line) + (offset >> 3);
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD8 *pixel = ((CARD8 *) line) + (offset >> 3);
#if IMAGE_BYTE_ORDER == MSBFirst
return (0xff000000 |
(pixel[2] << 16) |
@@ -1588,9 +1588,9 @@
static uint32_t
fbFetch_r5g6b5 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint32_t pixel = ((uint16_t *) line)[offset >> 4];
- uint32_t r,g,b;
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD32 pixel = ((CARD16 *) line)[offset >> 4];
+ CARD32 r,g,b;
r = ((pixel & 0xf800) | ((pixel & 0xe000) >> 5)) << 8;
g = ((pixel & 0x07e0) | ((pixel & 0x0600) >> 6)) << 5;
@@ -1601,9 +1601,9 @@
static uint32_t
fbFetch_b5g6r5 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint32_t pixel = ((uint16_t *) line)[offset >> 4];
- uint32_t r,g,b;
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD32 pixel = ((CARD16 *) line)[offset >> 4];
+ CARD32 r,g,b;
b = ((pixel & 0xf800) | ((pixel & 0xe000) >> 5)) >> 8;
g = ((pixel & 0x07e0) | ((pixel & 0x0600) >> 6)) << 5;
@@ -1614,11 +1614,11 @@
static uint32_t
fbFetch_a1r5g5b5 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint32_t pixel = ((uint16_t *) line)[offset >> 4];
- uint32_t a,r,g,b;
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD32 pixel = ((CARD16 *) line)[offset >> 4];
+ CARD32 a,r,g,b;
- a = (uint32_t) ((uint8_t) (0 - ((pixel & 0x8000) >> 15))) << 24;
+ a = (CARD32) ((CARD8) (0 - ((pixel & 0x8000) >> 15))) << 24;
r = ((pixel & 0x7c00) | ((pixel & 0x7000) >> 5)) << 9;
g = ((pixel & 0x03e0) | ((pixel & 0x0380) >> 5)) << 6;
b = ((pixel & 0x001c) | ((pixel & 0x001f) << 5)) >> 2;
@@ -1628,9 +1628,9 @@
static uint32_t
fbFetch_x1r5g5b5 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint32_t pixel = ((uint16_t *) line)[offset >> 4];
- uint32_t r,g,b;
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD32 pixel = ((CARD16 *) line)[offset >> 4];
+ CARD32 r,g,b;
r = ((pixel & 0x7c00) | ((pixel & 0x7000) >> 5)) << 9;
g = ((pixel & 0x03e0) | ((pixel & 0x0380) >> 5)) << 6;
@@ -1641,11 +1641,11 @@
static uint32_t
fbFetch_a1b5g5r5 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint32_t pixel = ((uint16_t *) line)[offset >> 4];
- uint32_t a,r,g,b;
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD32 pixel = ((CARD16 *) line)[offset >> 4];
+ CARD32 a,r,g,b;
- a = (uint32_t) ((uint8_t) (0 - ((pixel & 0x8000) >> 15))) << 24;
+ a = (CARD32) ((CARD8) (0 - ((pixel & 0x8000) >> 15))) << 24;
b = ((pixel & 0x7c00) | ((pixel & 0x7000) >> 5)) >> 7;
g = ((pixel & 0x03e0) | ((pixel & 0x0380) >> 5)) << 6;
r = ((pixel & 0x001c) | ((pixel & 0x001f) << 5)) << 14;
@@ -1655,9 +1655,9 @@
static uint32_t
fbFetch_x1b5g5r5 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint32_t pixel = ((uint16_t *) line)[offset >> 4];
- uint32_t r,g,b;
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD32 pixel = ((CARD16 *) line)[offset >> 4];
+ CARD32 r,g,b;
b = ((pixel & 0x7c00) | ((pixel & 0x7000) >> 5)) >> 7;
g = ((pixel & 0x03e0) | ((pixel & 0x0380) >> 5)) << 6;
@@ -1668,9 +1668,9 @@
static uint32_t
fbFetch_a4r4g4b4 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint32_t pixel = ((uint16_t *) line)[offset >> 4];
- uint32_t a,r,g,b;
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD32 pixel = ((CARD16 *) line)[offset >> 4];
+ CARD32 a,r,g,b;
a = ((pixel & 0xf000) | ((pixel & 0xf000) >> 4)) << 16;
r = ((pixel & 0x0f00) | ((pixel & 0x0f00) >> 4)) << 12;
@@ -1682,9 +1682,9 @@
static uint32_t
fbFetch_x4r4g4b4 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint32_t pixel = ((uint16_t *) line)[offset >> 4];
- uint32_t r,g,b;
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD32 pixel = ((CARD16 *) line)[offset >> 4];
+ CARD32 r,g,b;
r = ((pixel & 0x0f00) | ((pixel & 0x0f00) >> 4)) << 12;
g = ((pixel & 0x00f0) | ((pixel & 0x00f0) >> 4)) << 8;
@@ -1695,9 +1695,9 @@
static uint32_t
fbFetch_a4b4g4r4 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint32_t pixel = ((uint16_t *) line)[offset >> 4];
- uint32_t a,r,g,b;
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD32 pixel = ((CARD16 *) line)[offset >> 4];
+ CARD32 a,r,g,b;
a = ((pixel & 0xf000) | ((pixel & 0xf000) >> 4)) << 16;
b = ((pixel & 0x0f00) | ((pixel & 0x0f00) >> 4)) << 12;
@@ -1709,9 +1709,9 @@
static uint32_t
fbFetch_x4b4g4r4 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint32_t pixel = ((uint16_t *) line)[offset >> 4];
- uint32_t r,g,b;
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD32 pixel = ((CARD16 *) line)[offset >> 4];
+ CARD32 r,g,b;
b = ((pixel & 0x0f00) | ((pixel & 0x0f00) >> 4)) << 12;
g = ((pixel & 0x00f0) | ((pixel & 0x00f0) >> 4)) << 8;
@@ -1722,8 +1722,8 @@
static uint32_t
fbFetch_a8 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint32_t pixel = ((uint8_t *) line)[offset>>3];
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD32 pixel = ((CARD8 *) line)[offset>>3];
return pixel << 24;
}
@@ -1731,8 +1731,8 @@
static uint32_t
fbFetcha_a8 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint32_t pixel = ((uint8_t *) line)[offset>>3];
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD32 pixel = ((CARD8 *) line)[offset>>3];
pixel |= pixel << 8;
pixel |= pixel << 16;
@@ -1742,9 +1742,9 @@
static uint32_t
fbFetch_r3g3b2 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint32_t pixel = ((uint8_t *) line)[offset>>3];
- uint32_t r,g,b;
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD32 pixel = ((CARD8 *) line)[offset>>3];
+ CARD32 r,g,b;
r = ((pixel & 0xe0) | ((pixel & 0xe0) >> 3) | ((pixel & 0xc0) >> 6)) << 16;
g = ((pixel & 0x1c) | ((pixel & 0x18) >> 3) | ((pixel & 0x1c) << 3)) << 8;
@@ -1758,9 +1758,9 @@
static uint32_t
fbFetch_b2g3r3 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint32_t pixel = ((uint8_t *) line)[offset>>3];
- uint32_t r,g,b;
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD32 pixel = ((CARD8 *) line)[offset>>3];
+ CARD32 r,g,b;
b = (((pixel & 0xc0) ) |
((pixel & 0xc0) >> 2) |
@@ -1776,9 +1776,9 @@
static uint32_t
fbFetch_a2r2g2b2 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint32_t pixel = ((uint8_t *) line)[offset>>3];
- uint32_t a,r,g,b;
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD32 pixel = ((CARD8 *) line)[offset>>3];
+ CARD32 a,r,g,b;
a = ((pixel & 0xc0) * 0x55) << 18;
r = ((pixel & 0x30) * 0x55) << 12;
@@ -1787,7 +1787,7 @@
return a|r|g|b;
}
-#define Fetch8(l,o) (((uint8_t *) (l))[(o) >> 3])
+#define Fetch8(l,o) (((CARD8 *) (l))[(o) >> 3])
#if IMAGE_BYTE_ORDER == MSBFirst
#define Fetch4(l,o) ((o) & 2 ? Fetch8(l,o) & 0xf : Fetch8(l,o) >> 4)
#else
@@ -1797,8 +1797,8 @@
static uint32_t
fbFetch_a4 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint32_t pixel = Fetch4(line, offset);
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD32 pixel = Fetch4(line, offset);
pixel |= pixel << 4;
return pixel << 24;
@@ -1807,8 +1807,8 @@
static uint32_t
fbFetcha_a4 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint32_t pixel = Fetch4(line, offset);
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD32 pixel = Fetch4(line, offset);
pixel |= pixel << 4;
pixel |= pixel << 8;
@@ -1819,9 +1819,9 @@
static uint32_t
fbFetch_r1g2b1 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint32_t pixel = Fetch4(line, offset);
- uint32_t r,g,b;
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD32 pixel = Fetch4(line, offset);
+ CARD32 r,g,b;
r = ((pixel & 0x8) * 0xff) << 13;
g = ((pixel & 0x6) * 0x55) << 7;
@@ -1832,9 +1832,9 @@
static uint32_t
fbFetch_b1g2r1 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint32_t pixel = Fetch4(line, offset);
- uint32_t r,g,b;
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD32 pixel = Fetch4(line, offset);
+ CARD32 r,g,b;
b = ((pixel & 0x8) * 0xff) >> 3;
g = ((pixel & 0x6) * 0x55) << 7;
@@ -1845,9 +1845,9 @@
static uint32_t
fbFetch_a1r1g1b1 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint32_t pixel = Fetch4(line, offset);
- uint32_t a,r,g,b;
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD32 pixel = Fetch4(line, offset);
+ CARD32 a,r,g,b;
a = ((pixel & 0x8) * 0xff) << 21;
r = ((pixel & 0x4) * 0xff) << 14;
@@ -1859,9 +1859,9 @@
static uint32_t
fbFetch_a1b1g1r1 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint32_t pixel = Fetch4(line, offset);
- uint32_t a,r,g,b;
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD32 pixel = Fetch4(line, offset);
+ CARD32 a,r,g,b;
a = ((pixel & 0x8) * 0xff) << 21;
r = ((pixel & 0x4) * 0xff) >> 3;
@@ -1873,9 +1873,9 @@
static uint32_t
fbFetcha_a1 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint32_t pixel = ((uint32_t *)line)[offset >> 5];
- uint32_t a;
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD32 pixel = ((CARD32 *)line)[offset >> 5];
+ CARD32 a;
#if BITMAP_BIT_ORDER == MSBFirst
a = pixel >> (0x1f - (offset & 0x1f));
#else
@@ -1893,9 +1893,9 @@
static uint32_t
fbFetch_a1 (FbCompositeOperand *op)
{
- FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
- uint32_t pixel = ((uint32_t *)line)[offset >> 5];
- uint32_t a;
+ FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
+ CARD32 pixel = ((CARD32 *)line)[offset >> 5];
+ CARD32 a;
#if BITMAP_BIT_ORDER == MSBFirst
a = pixel >> (0x1f - (offset & 0x1f));
#else
@@ -2549,10 +2549,10 @@
int
fbBuildCompositeOperand (pixman_image_t *image,
FbCompositeOperand op[4],
- int16_t x,
- int16_t y,
- int transform,
- int alpha)
+ INT16 x,
+ INT16 y,
+ Bool transform,
+ Bool alpha)
{
/* Check for transform */
if (transform && image->transform)
@@ -2658,25 +2658,25 @@
op->u.drawable.stride = stride;
op->u.drawable.bpp = bpp;
- return 1;
+ return TRUE;
}
- return 0;
+ return FALSE;
}
}
void
pixman_compositeGeneral (pixman_operator_t op,
- pixman_image_t *iSrc,
- pixman_image_t *iMask,
- pixman_image_t *iDst,
- int16_t xSrc,
- int16_t ySrc,
- int16_t xMask,
- int16_t yMask,
- int16_t xDst,
- int16_t yDst,
- uint16_t width,
- uint16_t height)
+ PicturePtr pSrc,
+ PicturePtr pMask,
+ PicturePtr pDst,
+ INT16 xSrc,
+ INT16 ySrc,
+ INT16 xMask,
+ INT16 yMask,
+ INT16 xDst,
+ INT16 yDst,
+ CARD16 width,
+ CARD16 height)
{
FbCompositeOperand src[4],msk[4],dst[4],*pmsk;
FbCompositeOperand *srcPict, *srcAlpha;
@@ -2685,11 +2685,11 @@
FbCombineFunc f;
int w;
- if (!fbBuildCompositeOperand (iSrc, src, xSrc, ySrc, 1, 1))
+ if (!fbBuildCompositeOperand (pSrc, src, xSrc, ySrc, TRUE, TRUE))
return;
- if (!fbBuildCompositeOperand (iDst, dst, xDst, yDst, 0, 1))
+ if (!fbBuildCompositeOperand (pDst, dst, xDst, yDst, FALSE, TRUE))
return;
- if (iSrc->alphaMap)
+ if (pSrc->alphaMap)
{
srcPict = &src[1];
srcAlpha = &src[2];
@@ -2699,7 +2699,7 @@
srcPict = &src[0];
srcAlpha = 0;
}
- if (iDst->alphaMap)
+ if (pDst->alphaMap)
{
dstPict = &dst[1];
dstAlpha = &dst[2];
@@ -2710,14 +2710,14 @@
dstAlpha = 0;
}
f = fbCombineFuncU[op];
- if (iMask)
+ if (pMask)
{
- if (!fbBuildCompositeOperand (iMask, msk, xMask, yMask, 1, 1))
+ if (!fbBuildCompositeOperand (pMask, msk, xMask, yMask, TRUE, TRUE))
return;
pmsk = msk;
- if (iMask->componentAlpha)
+ if (pMask->componentAlpha)
f = fbCombineFuncC[op];
- if (iMask->alphaMap)
+ if (pMask->alphaMap)
{
mskPict = &msk[1];
mskAlpha = &msk[2];
Index: icint.h
===================================================================
RCS file: /cvs/cairo/libpixman/src/icint.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- icint.h 25 Jun 2005 21:41:38 -0000 1.33
+++ icint.h 25 Jun 2005 22:03:17 -0000 1.34
@@ -70,7 +70,27 @@
#define CPLastBit 11
+/* Define any names that the server code will be expecting in
+ * terms of libpixman names. */
+
+typedef uint8_t CARD8;
+typedef uint16_t CARD16;
+typedef uint32_t CARD32;
+typedef int16_t INT16;
+typedef int Bool;
+#define FALSE 0
+#define TRUE 1
+
+typedef pixman_bits_t FbBits;
+typedef pixman_image_t* PicturePtr;
+typedef pixman_box16_t BoxRec;
+typedef pixman_box16_t* BoxPtr;
+
+typedef pixman_point_fixed_t xPointFixed;
+typedef pixman_line_fixed_t xLineFixed;
+typedef pixman_trapezoid_t xTrapezoid;
+typedef pixman_triangle_t xTriangle;
/* These few definitions avoid me needing to include servermd.h and misc.h from Xserver/include */
#ifndef BITMAP_SCANLINE_PAD
@@ -138,7 +158,7 @@
#define FbStipStrideToBitsStride(s) (((s) >> (FB_SHIFT - FB_STIP_SHIFT)))
#define FbBitsStrideToStipStride(s) (((s) << (FB_SHIFT - FB_STIP_SHIFT)))
-#define FbFullMask(n) ((n) == FB_UNIT ? FB_ALLONES : ((((pixman_bits_t) 1) << n) - 1))
+#define FbFullMask(n) ((n) == FB_UNIT ? FB_ALLONES : ((((FbBits) 1) << n) - 1))
typedef uint32_t FbStip;
@@ -159,7 +179,7 @@
#if BITMAP_BIT_ORDER == LSBFirst
#define FbScrLeft(x,n) ((x) >> (n))
#define FbScrRight(x,n) ((x) << (n))
-/* #define FbLeftBits(x,n) ((x) & ((((pixman_bits_t) 1) << (n)) - 1)) */
+/* #define FbLeftBits(x,n) ((x) & ((((FbBits) 1) << (n)) - 1)) */
#define FbLeftStipBits(x,n) ((x) & ((((FbStip) 1) << (n)) - 1))
#define FbStipMoveLsb(x,s,n) (FbStipRight (x,(s)-(n)))
#define FbPatternOffsetBits 0
@@ -169,7 +189,7 @@
/* #define FbLeftBits(x,n) ((x) >> (FB_UNIT - (n))) */
#define FbLeftStipBits(x,n) ((x) >> (FB_STIP_UNIT - (n)))
#define FbStipMoveLsb(x,s,n) (x)
-#define FbPatternOffsetBits (sizeof (pixman_bits_t) - 1)
+#define FbPatternOffsetBits (sizeof (FbBits) - 1)
#endif
#define FbStipLeft(x,n) FbScrLeft(x,n)
@@ -227,7 +247,7 @@
#define FbPatternOffset(o,t) ((o) ^ (FbPatternOffsetBits & ~(sizeof (t) - 1)))
-#define FbPtrOffset(p,o,t) ((t *) ((uint8_t *) (p) + (o)))
+#define FbPtrOffset(p,o,t) ((t *) ((CARD8 *) (p) + (o)))
#define FbSelectPatternPart(xor,o,t) ((xor) >> (FbPatternOffset (o,t) << 3))
#define FbStorePart(dst,off,t,xor) (*FbPtrOffset(dst,off,t) = \
FbSelectPart(xor,off,t))
@@ -277,111 +297,111 @@
#if FB_SHIFT == 6
#define FbDoLeftMaskByteRRop6Cases(dst,xor) \
- case (sizeof (pixman_bits_t) - 7) | (1 << (FB_SHIFT - 3)): \
- FbStorePart(dst,sizeof (pixman_bits_t) - 7,uint8_t,xor); \
+ case (sizeof (FbBits) - 7) | (1 << (FB_SHIFT - 3)): \
+ FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \
break; \
- case (sizeof (pixman_bits_t) - 7) | (2 << (FB_SHIFT - 3)): \
- FbStorePart(dst,sizeof (pixman_bits_t) - 7,uint8_t,xor); \
- FbStorePart(dst,sizeof (pixman_bits_t) - 6,uint8_t,xor); \
+ case (sizeof (FbBits) - 7) | (2 << (FB_SHIFT - 3)): \
+ FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \
+ FbStorePart(dst,sizeof (FbBits) - 6,CARD8,xor); \
break; \
- case (sizeof (pixman_bits_t) - 7) | (3 << (FB_SHIFT - 3)): \
- FbStorePart(dst,sizeof (pixman_bits_t) - 7,uint8_t,xor); \
- FbStorePart(dst,sizeof (pixman_bits_t) - 6,uint16_t,xor); \
+ case (sizeof (FbBits) - 7) | (3 << (FB_SHIFT - 3)): \
+ FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \
+ FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \
break; \
- case (sizeof (pixman_bits_t) - 7) | (4 << (FB_SHIFT - 3)): \
- FbStorePart(dst,sizeof (pixman_bits_t) - 7,uint8_t,xor); \
- FbStorePart(dst,sizeof (pixman_bits_t) - 6,uint16_t,xor); \
- FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint8_t,xor); \
+ case (sizeof (FbBits) - 7) | (4 << (FB_SHIFT - 3)): \
+ FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \
+ FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \
+ FbStorePart(dst,sizeof (FbBits) - 4,CARD8,xor); \
break; \
- case (sizeof (pixman_bits_t) - 7) | (5 << (FB_SHIFT - 3)): \
- FbStorePart(dst,sizeof (pixman_bits_t) - 7,uint8_t,xor); \
- FbStorePart(dst,sizeof (pixman_bits_t) - 6,uint16_t,xor); \
- FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint16_t,xor); \
+ case (sizeof (FbBits) - 7) | (5 << (FB_SHIFT - 3)): \
+ FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \
+ FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \
+ FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \
break; \
- case (sizeof (pixman_bits_t) - 7) | (6 << (FB_SHIFT - 3)): \
- FbStorePart(dst,sizeof (pixman_bits_t) - 7,uint8_t,xor); \
- FbStorePart(dst,sizeof (pixman_bits_t) - 6,uint16_t,xor); \
- FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint16_t,xor); \
- FbStorePart(dst,sizeof (pixman_bits_t) - 2,uint8_t,xor); \
+ case (sizeof (FbBits) - 7) | (6 << (FB_SHIFT - 3)): \
+ FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \
+ FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \
+ FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \
+ FbStorePart(dst,sizeof (FbBits) - 2,CARD8,xor); \
break; \
- case (sizeof (pixman_bits_t) - 7): \
- FbStorePart(dst,sizeof (pixman_bits_t) - 7,uint8_t,xor); \
- FbStorePart(dst,sizeof (pixman_bits_t) - 6,uint16_t,xor); \
- FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint32_t,xor); \
+ case (sizeof (FbBits) - 7): \
+ FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \
+ FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \
+ FbStorePart(dst,sizeof (FbBits) - 4,CARD32,xor); \
break; \
- case (sizeof (pixman_bits_t) - 6) | (1 << (FB_SHIFT - 3)): \
- FbStorePart(dst,sizeof (pixman_bits_t) - 6,uint8_t,xor); \
+ case (sizeof (FbBits) - 6) | (1 << (FB_SHIFT - 3)): \
+ FbStorePart(dst,sizeof (FbBits) - 6,CARD8,xor); \
break; \
- case (sizeof (pixman_bits_t) - 6) | (2 << (FB_SHIFT - 3)): \
- FbStorePart(dst,sizeof (pixman_bits_t) - 6,uint16_t,xor); \
+ case (sizeof (FbBits) - 6) | (2 << (FB_SHIFT - 3)): \
+ FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \
break; \
- case (sizeof (pixman_bits_t) - 6) | (3 << (FB_SHIFT - 3)): \
- FbStorePart(dst,sizeof (pixman_bits_t) - 6,uint16_t,xor); \
- FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint8_t,xor); \
+ case (sizeof (FbBits) - 6) | (3 << (FB_SHIFT - 3)): \
+ FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \
+ FbStorePart(dst,sizeof (FbBits) - 4,CARD8,xor); \
break; \
- case (sizeof (pixman_bits_t) - 6) | (4 << (FB_SHIFT - 3)): \
- FbStorePart(dst,sizeof (pixman_bits_t) - 6,uint16_t,xor); \
- FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint16_t,xor); \
+ case (sizeof (FbBits) - 6) | (4 << (FB_SHIFT - 3)): \
+ FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \
+ FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \
break; \
- case (sizeof (pixman_bits_t) - 6) | (5 << (FB_SHIFT - 3)): \
- FbStorePart(dst,sizeof (pixman_bits_t) - 6,uint16_t,xor); \
- FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint16_t,xor); \
- FbStorePart(dst,sizeof (pixman_bits_t) - 2,uint8_t,xor); \
+ case (sizeof (FbBits) - 6) | (5 << (FB_SHIFT - 3)): \
+ FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \
+ FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \
+ FbStorePart(dst,sizeof (FbBits) - 2,CARD8,xor); \
break; \
- case (sizeof (pixman_bits_t) - 6): \
- FbStorePart(dst,sizeof (pixman_bits_t) - 6,uint16_t,xor); \
- FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint32_t,xor); \
+ case (sizeof (FbBits) - 6): \
+ FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \
+ FbStorePart(dst,sizeof (FbBits) - 4,CARD32,xor); \
break; \
- case (sizeof (pixman_bits_t) - 5) | (1 << (FB_SHIFT - 3)): \
- FbStorePart(dst,sizeof (pixman_bits_t) - 5,uint8_t,xor); \
+ case (sizeof (FbBits) - 5) | (1 << (FB_SHIFT - 3)): \
+ FbStorePart(dst,sizeof (FbBits) - 5,CARD8,xor); \
break; \
- case (sizeof (pixman_bits_t) - 5) | (2 << (FB_SHIFT - 3)): \
- FbStorePart(dst,sizeof (pixman_bits_t) - 5,uint8_t,xor); \
- FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint8_t,xor); \
+ case (sizeof (FbBits) - 5) | (2 << (FB_SHIFT - 3)): \
+ FbStorePart(dst,sizeof (FbBits) - 5,CARD8,xor); \
+ FbStorePart(dst,sizeof (FbBits) - 4,CARD8,xor); \
break; \
- case (sizeof (pixman_bits_t) - 5) | (3 << (FB_SHIFT - 3)): \
- FbStorePart(dst,sizeof (pixman_bits_t) - 5,uint8_t,xor); \
- FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint16_t,xor); \
+ case (sizeof (FbBits) - 5) | (3 << (FB_SHIFT - 3)): \
+ FbStorePart(dst,sizeof (FbBits) - 5,CARD8,xor); \
+ FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \
break; \
- case (sizeof (pixman_bits_t) - 5) | (4 << (FB_SHIFT - 3)): \
- FbStorePart(dst,sizeof (pixman_bits_t) - 5,uint8_t,xor); \
- FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint16_t,xor); \
- FbStorePart(dst,sizeof (pixman_bits_t) - 2,uint8_t,xor); \
+ case (sizeof (FbBits) - 5) | (4 << (FB_SHIFT - 3)): \
+ FbStorePart(dst,sizeof (FbBits) - 5,CARD8,xor); \
+ FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \
+ FbStorePart(dst,sizeof (FbBits) - 2,CARD8,xor); \
break; \
- case (sizeof (pixman_bits_t) - 5): \
- FbStorePart(dst,sizeof (pixman_bits_t) - 5,uint8_t,xor); \
- FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint32_t,xor); \
+ case (sizeof (FbBits) - 5): \
+ FbStorePart(dst,sizeof (FbBits) - 5,CARD8,xor); \
+ FbStorePart(dst,sizeof (FbBits) - 4,CARD32,xor); \
break; \
- case (sizeof (pixman_bits_t) - 4) | (1 << (FB_SHIFT - 3)): \
- FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint8_t,xor); \
+ case (sizeof (FbBits) - 4) | (1 << (FB_SHIFT - 3)): \
+ FbStorePart(dst,sizeof (FbBits) - 4,CARD8,xor); \
break; \
- case (sizeof (pixman_bits_t) - 4) | (2 << (FB_SHIFT - 3)): \
- FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint16_t,xor); \
+ case (sizeof (FbBits) - 4) | (2 << (FB_SHIFT - 3)): \
+ FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \
break; \
- case (sizeof (pixman_bits_t) - 4) | (3 << (FB_SHIFT - 3)): \
- FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint16_t,xor); \
- FbStorePart(dst,sizeof (pixman_bits_t) - 2,uint8_t,xor); \
+ case (sizeof (FbBits) - 4) | (3 << (FB_SHIFT - 3)): \
+ FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \
+ FbStorePart(dst,sizeof (FbBits) - 2,CARD8,xor); \
break; \
- case (sizeof (pixman_bits_t) - 4): \
- FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint32_t,xor); \
+ case (sizeof (FbBits) - 4): \
+ FbStorePart(dst,sizeof (FbBits) - 4,CARD32,xor); \
break;
#define FbDoRightMaskByteRRop6Cases(dst,xor) \
case 4: \
- FbStorePart(dst,0,uint32_t,xor); \
+ FbStorePart(dst,0,CARD32,xor); \
break; \
case 5: \
- FbStorePart(dst,0,uint32_t,xor); \
- FbStorePart(dst,4,uint8_t,xor); \
+ FbStorePart(dst,0,CARD32,xor); \
+ FbStorePart(dst,4,CARD8,xor); \
break; \
case 6: \
- FbStorePart(dst,0,uint32_t,xor); \
- FbStorePart(dst,4,uint16_t,xor); \
+ FbStorePart(dst,0,CARD32,xor); \
+ FbStorePart(dst,4,CARD16,xor); \
break; \
case 7: \
- FbStorePart(dst,0,uint32_t,xor); \
- FbStorePart(dst,4,uint16_t,xor); \
- FbStorePart(dst,6,uint8_t,xor); \
+ FbStorePart(dst,0,CARD32,xor); \
+ FbStorePart(dst,4,CARD16,xor); \
+ FbStorePart(dst,6,CARD8,xor); \
break;
#else
#define FbDoLeftMaskByteRRop6Cases(dst,xor)
@@ -391,23 +411,23 @@
#define FbDoLeftMaskByteRRop(dst,lb,l,and,xor) { \
switch (lb) { \
FbDoLeftMaskByteRRop6Cases(dst,xor) \
- case (sizeof (pixman_bits_t) - 3) | (1 << (FB_SHIFT - 3)): \
- FbStorePart(dst,sizeof (pixman_bits_t) - 3,uint8_t,xor); \
+ case (sizeof (FbBits) - 3) | (1 << (FB_SHIFT - 3)): \
+ FbStorePart(dst,sizeof (FbBits) - 3,CARD8,xor); \
break; \
- case (sizeof (pixman_bits_t) - 3) | (2 << (FB_SHIFT - 3)): \
- FbStorePart(dst,sizeof (pixman_bits_t) - 3,uint8_t,xor); \
- FbStorePart(dst,sizeof (pixman_bits_t) - 2,uint8_t,xor); \
+ case (sizeof (FbBits) - 3) | (2 << (FB_SHIFT - 3)): \
+ FbStorePart(dst,sizeof (FbBits) - 3,CARD8,xor); \
+ FbStorePart(dst,sizeof (FbBits) - 2,CARD8,xor); \
break; \
- case (sizeof (pixman_bits_t) - 2) | (1 << (FB_SHIFT - 3)): \
- FbStorePart(dst,sizeof (pixman_bits_t) - 2,uint8_t,xor); \
+ case (sizeof (FbBits) - 2) | (1 << (FB_SHIFT - 3)): \
+ FbStorePart(dst,sizeof (FbBits) - 2,CARD8,xor); \
break; \
- case sizeof (pixman_bits_t) - 3: \
- FbStorePart(dst,sizeof (pixman_bits_t) - 3,uint8_t,xor); \
- case sizeof (pixman_bits_t) - 2: \
- FbStorePart(dst,sizeof (pixman_bits_t) - 2,uint16_t,xor); \
+ case sizeof (FbBits) - 3: \
+ FbStorePart(dst,sizeof (FbBits) - 3,CARD8,xor); \
+ case sizeof (FbBits) - 2: \
+ FbStorePart(dst,sizeof (FbBits) - 2,CARD16,xor); \
break; \
- case sizeof (pixman_bits_t) - 1: \
- FbStorePart(dst,sizeof (pixman_bits_t) - 1,uint8_t,xor); \
+ case sizeof (FbBits) - 1: \
+ FbStorePart(dst,sizeof (FbBits) - 1,CARD8,xor); \
break; \
default: \
*dst = FbDoMaskRRop(*dst, and, xor, l); \
@@ -419,14 +439,14 @@
#define FbDoRightMaskByteRRop(dst,rb,r,and,xor) { \
switch (rb) { \
case 1: \
- FbStorePart(dst,0,uint8_t,xor); \
+ FbStorePart(dst,0,CARD8,xor); \
break; \
case 2: \
- FbStorePart(dst,0,uint16_t,xor); \
+ FbStorePart(dst,0,CARD16,xor); \
break; \
case 3: \
- FbStorePart(dst,0,uint16_t,xor); \
- FbStorePart(dst,2,uint8_t,xor); \
+ FbStorePart(dst,0,CARD16,xor); \
+ FbStorePart(dst,2,CARD8,xor); \
break; \
FbDoRightMaskByteRRop6Cases(dst,xor) \
default: \
@@ -457,34 +477,34 @@
* sequence of partial word writes
*
* 'n' is the bytemask of which bytes to store, 'a' is the address
- * of the pixman_bits_t base unit, 'o' is the offset within that unit
+ * of the FbBits base unit, 'o' is the offset within that unit
*
* The term "lane" comes from the hardware term "byte-lane" which
*/
#define FbLaneCase1(n,a,o) ((n) == 0x01 ? \
- (*(uint8_t *) ((a)+FbPatternOffset(o,uint8_t)) = \
+ (*(CARD8 *) ((a)+FbPatternOffset(o,CARD8)) = \
fgxor) : 0)
#define FbLaneCase2(n,a,o) ((n) == 0x03 ? \
- (*(uint16_t *) ((a)+FbPatternOffset(o,uint16_t)) = \
+ (*(CARD16 *) ((a)+FbPatternOffset(o,CARD16)) = \
fgxor) : \
((void)FbLaneCase1((n)&1,a,o), \
FbLaneCase1((n)>>1,a,(o)+1)))
#define FbLaneCase4(n,a,o) ((n) == 0x0f ? \
- (*(uint32_t *) ((a)+FbPatternOffset(o,uint32_t)) = \
+ (*(CARD32 *) ((a)+FbPatternOffset(o,CARD32)) = \
fgxor) : \
((void)FbLaneCase2((n)&3,a,o), \
FbLaneCase2((n)>>2,a,(o)+2)))
-#define FbLaneCase8(n,a,o) ((n) == 0x0ff ? (*(pixman_bits_t *) ((a)+(o)) = fgxor) : \
+#define FbLaneCase8(n,a,o) ((n) == 0x0ff ? (*(FbBits *) ((a)+(o)) = fgxor) : \
((void)FbLaneCase4((n)&15,a,o), \
FbLaneCase4((n)>>4,a,(o)+4)))
#if FB_SHIFT == 6
-#define FbLaneCase(n,a) FbLaneCase8(n,(uint8_t *) (a),0)
+#define FbLaneCase(n,a) FbLaneCase8(n,(CARD8 *) (a),0)
#endif
#if FB_SHIFT == 5
-#define FbLaneCase(n,a) FbLaneCase4(n,(uint8_t *) (a),0)
+#define FbLaneCase(n,a) FbLaneCase4(n,(CARD8 *) (a),0)
#endif
/* Rotate a filled pixel value to the specified alignement */
@@ -553,7 +573,7 @@
/*
* Accelerated tiles are power of 2 width <= FB_UNIT
*/
-#define fbEvenTile(w) ((w) <= FB_UNIT && FbPowerOfTwo(w))
+#define FbEvenTile(w) ((w) <= FB_UNIT && FbPowerOfTwo(w))
/*
* Accelerated stipples are power of 2 width and <= FB_UNIT/dstBpp
* with dstBpp a power of 2 as well
@@ -568,7 +588,7 @@
FbStride srcStride,
int srcX,
- pixman_bits_t *dst,
+ FbBits *dst,
FbStride dstStride,
int dstX,
@@ -576,18 +596,18 @@
int height,
int alu,
- pixman_bits_t pm,
+ FbBits pm,
int bpp,
- int reverse,
- int upsidedown);
+ Bool reverse,
+ Bool upsidedown);
pixman_private void
fbBlt24 (pixman_bits_t *srcLine,
FbStride srcStride,
int srcX,
- pixman_bits_t *dstLine,
+ FbBits *dstLine,
FbStride dstStride,
int dstX,
@@ -595,25 +615,25 @@
int height,
int alu,
- pixman_bits_t pm,
+ FbBits pm,
- int reverse,
- int upsidedown);
+ Bool reverse,
+ Bool upsidedown);
pixman_private void
fbBltStip (FbStip *src,
- FbStride srcStride, /* in FbStip units, not pixman_bits_t units */
+ FbStride srcStride, /* in FbStip units, not FbBits units */
int srcX,
FbStip *dst,
- FbStride dstStride, /* in FbStip units, not pixman_bits_t units */
+ FbStride dstStride, /* in FbStip units, not FbBits units */
int dstX,
int width,
int height,
int alu,
- pixman_bits_t pm,
+ FbBits pm,
int bpp);
/*
@@ -623,7 +643,7 @@
fbBltOne (FbStip *src,
FbStride srcStride,
int srcX,
- pixman_bits_t *dst,
+ FbBits *dst,
FbStride dstStride,
int dstX,
int dstBpp,
@@ -631,28 +651,28 @@
int width,
int height,
- pixman_bits_t fgand,
- pixman_bits_t icxor,
- pixman_bits_t bgand,
- pixman_bits_t bgxor);
+ FbBits fgand,
+ FbBits fbxor,
+ FbBits bgand,
+ FbBits bgxor);
#ifdef FB_24BIT
pixman_private void
fbBltOne24 (FbStip *src,
FbStride srcStride, /* FbStip units per scanline */
int srcX, /* bit position of source */
- pixman_bits_t *dst,
- FbStride dstStride, /* pixman_bits_t units per scanline */
+ FbBits *dst,
+ FbStride dstStride, /* FbBits units per scanline */
int dstX, /* bit position of dest */
int dstBpp, /* bits per destination unit */
int width, /* width in bits of destination */
int height, /* height in scanlines */
- pixman_bits_t fgand, /* rrop values */
- pixman_bits_t fgxor,
- pixman_bits_t bgand,
- pixman_bits_t bgxor);
+ FbBits fgand, /* rrop values */
+ FbBits fgxor,
+ FbBits bgand,
+ FbBits bgxor);
#endif
/*
@@ -678,10 +698,10 @@
FbStride stipStride,
int stipHeight,
- pixman_bits_t fgand,
- pixman_bits_t fgxor,
- pixman_bits_t bgand,
- pixman_bits_t bgxor,
+ FbBits fgand,
+ FbBits fgxor,
+ FbBits bgand,
+ FbBits bgxor,
int xRot,
int yRot);
@@ -700,10 +720,10 @@
int stipWidth,
int stipHeight,
- pixman_bits_t fgand,
- pixman_bits_t fgxor,
- pixman_bits_t bgand,
- pixman_bits_t bgxor,
+ FbBits fgand,
+ FbBits fgxor,
+ FbBits bgand,
+ FbBits bgxor,
int xRot,
int yRot);
@@ -721,12 +741,12 @@
FbStride stipStride,
int stipWidth,
int stipHeight,
- int even,
+ Bool even,
- pixman_bits_t fgand,
- pixman_bits_t fgxor,
- pixman_bits_t bgand,
- pixman_bits_t bgxor,
+ FbBits fgand,
+ FbBits fgxor,
+ FbBits bgand,
+ FbBits bgxor,
int xRot,
int yRot);
Index: icrop.h
===================================================================
RCS file: /cvs/cairo/libpixman/src/icrop.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- icrop.h 25 Jun 2005 03:13:19 -0000 1.12
+++ icrop.h 25 Jun 2005 22:03:17 -0000 1.13
@@ -26,13 +26,13 @@
#define _ICROP_H_
typedef struct _mergeRopBits {
- pixman_bits_t ca1, cx1, ca2, cx2;
+ FbBits ca1, cx1, ca2, cx2;
} FbMergeRopRec, *FbMergeRopPtr;
extern const FbMergeRopRec FbMergeRopBits[16] pixman_private;
-#define FbDeclareMergeRop() pixman_bits_t _ca1, _cx1, _ca2, _cx2;
-#define FbDeclarePrebuiltMergeRop() pixman_bits_t _cca, _ccx;
+#define FbDeclareMergeRop() FbBits _ca1, _cx1, _ca2, _cx2;
+#define FbDeclarePrebuiltMergeRop() FbBits _cca, _ccx;
#define FbInitializeMergeRop(alu,pm) {\
const FbMergeRopRec *_bits; \
@@ -59,12 +59,12 @@
(((dst) & ((((src) & _ca1) ^ _cx1) | ~(mask))) ^ ((((src) & _ca2) ^ _cx2) & (mask)))
#define FbDoLeftMaskByteMergeRop(dst, src, lb, l) { \
- pixman_bits_t __xor = ((src) & _ca2) ^ _cx2; \
+ FbBits __xor = ((src) & _ca2) ^ _cx2; \
FbDoLeftMaskByteRRop(dst,lb,l,((src) & _ca1) ^ _cx1,__xor); \
}
#define FbDoRightMaskByteMergeRop(dst, src, rb, r) { \
- pixman_bits_t __xor = ((src) & _ca2) ^ _cx2; \
+ FbBits __xor = ((src) & _ca2) ^ _cx2; \
FbDoRightMaskByteRRop(dst,rb,r,((src) & _ca1) ^ _cx1,__xor); \
}
@@ -85,9 +85,9 @@
(~(fg) & fbFillFromBit((rop>>2) ^ (rop>>3),t))) | \
~(pm))
-#define fbXor(rop,fg,pm) fbXorT(rop,fg,pm,pixman_bits_t)
+#define fbXor(rop,fg,pm) fbXorT(rop,fg,pm,FbBits)
-#define fbAnd(rop,fg,pm) fbAndT(rop,fg,pm,pixman_bits_t)
+#define fbAnd(rop,fg,pm) fbAndT(rop,fg,pm,FbBits)
#define fbXorStip(rop,fg,pm) fbXorT(rop,fg,pm,FbStip)
@@ -112,12 +112,12 @@
(FbDoMaskRRop(dst, fa, fx, m) & (b)) | (FbDoMaskRRop(dst, ba, bx, m) & ~(b))
#define FbDoLeftMaskByteStippleRRop(dst, b, fa, fx, ba, bx, lb, l) { \
- pixman_bits_t __xor = ((fx) & (b)) | ((bx) & ~(b)); \
+ FbBits __xor = ((fx) & (b)) | ((bx) & ~(b)); \
FbDoLeftMaskByteRRop(dst, lb, l, ((fa) & (b)) | ((ba) & ~(b)), __xor); \
}
#define FbDoRightMaskByteStippleRRop(dst, b, fa, fx, ba, bx, rb, r) { \
- pixman_bits_t __xor = ((fx) & (b)) | ((bx) & ~(b)); \
+ FbBits __xor = ((fx) & (b)) | ((bx) & ~(b)); \
FbDoRightMaskByteRRop(dst, rb, r, ((fa) & (b)) | ((ba) & ~(b)), __xor); \
}
Index: icutil.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/icutil.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- icutil.c 25 Jun 2005 03:13:19 -0000 1.11
+++ icutil.c 25 Jun 2005 22:03:17 -0000 1.12
@@ -62,7 +62,7 @@
/*
* Stipple masks are independent of bit/byte order as long
- * as bitorder == byteorder. IC doesn't handle the case
+ * as bitorder == byteorder. FB doesn't handle the case
* where these differ
*/
#define BitsMask(x,w) ((FB_ALLONES << ((x) & FB_MASK)) & \
Index: pixman-xserver-compat.h
===================================================================
RCS file: /cvs/cairo/libpixman/src/pixman-xserver-compat.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pixman-xserver-compat.h 25 Jun 2005 03:13:19 -0000 1.5
+++ pixman-xserver-compat.h 25 Jun 2005 22:03:17 -0000 1.6
@@ -48,7 +48,7 @@
/* Then, define any names that the server code will be expecting in
* terms of libpixman names. */
-
+/*
typedef uint8_t CARD8;
typedef uint16_t CARD16;
typedef int16_t INT16;
@@ -66,7 +66,7 @@
typedef pixman_line_fixed_t xLineFixed;
typedef pixman_trapezoid_t xTrapezoid;
typedef pixman_triangle_t xTriangle;
-
+*/
#define RENDER 1
/*
#define FB_SHIFT IC_SHIFT
More information about the cairo-commit
mailing list