[cairo-commit] libpixman/src ic.c, 1.24, 1.25 icblt.c, 1.9,
1.10 icbltone.c, 1.10, 1.11 iccolor.c, 1.9, 1.10 iccompose.c,
1.22, 1.23 icformat.c, 1.13, 1.14 icimage.c, 1.29,
1.30 icimage.h, 1.25, 1.26 icint.h, 1.31, 1.32 icpixels.c, 1.8,
1.9 icrect.c, 1.14, 1.15 icrop.h, 1.11, 1.12 icstipple.c, 1.8,
1.9 ictrap.c, 1.25, 1.26 ictri.c, 1.13, 1.14 icutil.c, 1.10,
1.11 pixman-xserver-compat.h, 1.4, 1.5
Jeff Muizelaar
commit at pdx.freedesktop.org
Fri Jun 24 20:13:21 PDT 2005
Committed by: jrmuizel
Update of /cvs/cairo/libpixman/src
In directory gabe:/tmp/cvs-serv31968/src
Modified Files:
ic.c icblt.c icbltone.c iccolor.c iccompose.c icformat.c
icimage.c icimage.h icint.h icpixels.c icrect.c icrop.h
icstipple.c ictrap.c ictri.c icutil.c pixman-xserver-compat.h
Log Message:
2005-06-24 Jeff Muizelaar <jeff at infidigm.net>
* src/ic.c:
* src/icblt.c:
* src/icbltone.c:
* src/iccolor.c:
* src/iccompose.c:
* src/icformat.c:
* src/icimage.c:
* src/icimage.h:
* src/icint.h:
* src/icpixels.c:
* src/icrect.c:
* src/icrop.h:
* src/icstipple.c:
* src/ictrap.c:
* src/ictri.c:
* src/icutil.c:
* src/pixman-xserver-compat.h:
s/Ic/Fb/g
This gets read of most of the [Ii][cC]'s the rest will probably dealt
with on a case by case basis.
trimmed function list again.
Index: ic.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/ic.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ic.c 25 Jun 2005 01:28:19 -0000 1.24
+++ ic.c 25 Jun 2005 03:13:19 -0000 1.25
@@ -57,10 +57,10 @@
uint16_t t;
uint32_t m,n,o,p;
- m = IcOverU(x,y,0,a,t);
- n = IcOverU(x,y,8,a,t);
- o = IcOverU(x,y,16,a,t);
- p = IcOverU(x,y,24,a,t);
+ m = FbOverU(x,y,0,a,t);
+ n = FbOverU(x,y,8,a,t);
+ o = FbOverU(x,y,16,a,t);
+ p = FbOverU(x,y,24,a,t);
return m|n|o|p;
}
@@ -71,9 +71,9 @@
uint16_t t;
uint32_t m,n,o;
- m = IcOverU(x,y,0,a,t);
- n = IcOverU(x,y,8,a,t);
- o = IcOverU(x,y,16,a,t);
+ m = FbOverU(x,y,0,a,t);
+ n = FbOverU(x,y,8,a,t);
+ o = FbOverU(x,y,16,a,t);
return m|n|o;
}
@@ -84,20 +84,20 @@
uint16_t t;
uint32_t m,n,o,p;
- m = IcInU(x,0,a,t);
- n = IcInU(x,8,a,t);
- o = IcInU(x,16,a,t);
- p = IcInU(x,24,a,t);
+ m = FbInU(x,0,a,t);
+ n = FbInU(x,8,a,t);
+ o = FbInU(x,16,a,t);
+ p = FbInU(x,24,a,t);
return m|n|o|p;
}
#define fbComposeGetSolid(image, bits) { \
FbBits *__bits__; \
- IcStride __stride__; \
+ FbStride __stride__; \
int __bpp__; \
int __xoff__,__yoff__; \
\
- IcGetPixels((image)->pixels,__bits__,__stride__,__bpp__,__xoff__,__yoff__); \
+ FbGetPixels((image)->pixels,__bits__,__stride__,__bpp__,__xoff__,__yoff__); \
switch (__bpp__) { \
case 32: \
(bits) = *(uint32_t *) __bits__; \
@@ -119,11 +119,11 @@
#define fbComposeGetStart(image,x,y,type,stride,line,mul) {\
FbBits *__bits__; \
- IcStride __stride__; \
+ FbStride __stride__; \
int __bpp__; \
int __xoff__,__yoff__; \
\
- IcGetPixels((image)->pixels,__bits__,__stride__,__bpp__,__xoff__,__yoff__); \
+ FbGetPixels((image)->pixels,__bits__,__stride__,__bpp__,__xoff__,__yoff__); \
(stride) = __stride__ * sizeof (FbBits) / sizeof (type); \
(line) = ((type *) __bits__) + (stride) * ((y) - __yoff__) + (mul) * ((x) - __xoff__); \
}
@@ -151,12 +151,12 @@
uint32_t src, srca;
uint32_t *dstLine, *dst, d, dstMask;
uint8_t *maskLine, *mask, m;
- IcStride dstStride, maskStride;
+ FbStride dstStride, maskStride;
uint16_t w;
fbComposeGetSolid(iSrc, src);
- dstMask = IcFullMask (iDst->pixels->depth);
+ dstMask = FbFullMask (iDst->pixels->depth);
srca = src >> 24;
if (src == 0)
return;
@@ -209,13 +209,13 @@
uint32_t src, srca;
uint32_t *dstLine, *dst, d, dstMask;
uint32_t *maskLine, *mask, ma;
- IcStride dstStride, maskStride;
+ FbStride dstStride, maskStride;
uint16_t w;
uint32_t m, n, o, p;
fbComposeGetSolid(iSrc, src);
- dstMask = IcFullMask (iDst->pixels->depth);
+ dstMask = FbFullMask (iDst->pixels->depth);
srca = src >> 24;
if (src == 0)
return;
@@ -244,20 +244,20 @@
else if (ma)
{
d = *dst;
-#define IcInOverC(src,srca,msk,dst,i,result) { \
- uint16_t __a = IcGet8(msk,i); \
+#define FbInOverC(src,srca,msk,dst,i,result) { \
+ uint16_t __a = FbGet8(msk,i); \
uint32_t __t, __ta; \
uint32_t __i; \
- __t = IcIntMult (IcGet8(src,i), __a,__i); \
- __ta = (uint8_t) ~IcIntMult (srca, __a,__i); \
- __t = __t + IcIntMult(IcGet8(dst,i),__ta,__i); \
+ __t = FbIntMult (FbGet8(src,i), __a,__i); \
+ __ta = (uint8_t) ~FbIntMult (srca, __a,__i); \
+ __t = __t + FbIntMult(FbGet8(dst,i),__ta,__i); \
__t = (uint32_t) (uint8_t) (__t | (-(__t >> 8))); \
result = __t << (i); \
}
- IcInOverC (src, srca, ma, d, 0, m);
- IcInOverC (src, srca, ma, d, 8, n);
- IcInOverC (src, srca, ma, d, 16, o);
- IcInOverC (src, srca, ma, d, 24, p);
+ FbInOverC (src, srca, ma, d, 0, m);
+ FbInOverC (src, srca, ma, d, 8, n);
+ FbInOverC (src, srca, ma, d, 16, o);
+ FbInOverC (src, srca, ma, d, 24, p);
*dst = m|n|o|p;
}
dst++;
@@ -283,7 +283,7 @@
uint8_t *dstLine, *dst;
uint32_t d;
uint8_t *maskLine, *mask, m;
- IcStride dstStride, maskStride;
+ FbStride dstStride, maskStride;
uint16_t w;
fbComposeGetSolid(iSrc, src);
@@ -345,7 +345,7 @@
uint16_t *dstLine, *dst;
uint32_t d;
uint8_t *maskLine, *mask, m;
- IcStride dstStride, maskStride;
+ FbStride dstStride, maskStride;
uint16_t w;
fbComposeGetSolid(iSrc, src);
@@ -409,7 +409,7 @@
uint16_t *dstLine, *dst;
uint32_t d;
uint32_t *maskLine, *mask, ma;
- IcStride dstStride, maskStride;
+ FbStride dstStride, maskStride;
uint16_t w;
uint32_t m, n, o;
@@ -452,9 +452,9 @@
{
d = *dst;
d = cvt0565to8888(d);
- IcInOverC (src, srca, ma, d, 0, m);
- IcInOverC (src, srca, ma, d, 8, n);
- IcInOverC (src, srca, ma, d, 16, o);
+ FbInOverC (src, srca, ma, d, 0, m);
+ FbInOverC (src, srca, ma, d, 8, n);
+ FbInOverC (src, srca, ma, d, 16, o);
d = m|n|o;
*dst = cvt8888to0565(d);
}
@@ -479,14 +479,14 @@
{
uint32_t *dstLine, *dst, dstMask;
uint32_t *srcLine, *src, s;
- IcStride dstStride, srcStride;
+ FbStride dstStride, srcStride;
uint8_t a;
uint16_t w;
fbComposeGetStart (iDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
fbComposeGetStart (iSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
- dstMask = IcFullMask (iDst->pixels->depth);
+ dstMask = FbFullMask (iDst->pixels->depth);
while (height--)
{
@@ -527,7 +527,7 @@
uint32_t d;
uint32_t *srcLine, *src, s;
uint8_t a;
- IcStride dstStride, srcStride;
+ FbStride dstStride, srcStride;
uint16_t w;
fbComposeGetStart (iDst, xDst, yDst, uint8_t, dstStride, dstLine, 3);
@@ -576,7 +576,7 @@
uint32_t d;
uint32_t *srcLine, *src, s;
uint8_t a;
- IcStride dstStride, srcStride;
+ FbStride dstStride, srcStride;
uint16_t w;
fbComposeGetStart (iSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
@@ -626,7 +626,7 @@
{
uint16_t *dstLine, *dst;
uint16_t *srcLine, *src;
- IcStride dstStride, srcStride;
+ FbStride dstStride, srcStride;
uint16_t w;
fbComposeGetStart (iSrc, xSrc, ySrc, uint16_t, srcStride, srcLine, 1);
@@ -662,7 +662,7 @@
{
uint8_t *dstLine, *dst;
uint8_t *srcLine, *src;
- IcStride dstStride, srcStride;
+ FbStride dstStride, srcStride;
uint8_t w;
uint8_t s, d;
uint16_t t;
@@ -712,7 +712,7 @@
{
uint32_t *dstLine, *dst;
uint32_t *srcLine, *src;
- IcStride dstStride, srcStride;
+ FbStride dstStride, srcStride;
uint16_t w;
uint32_t s, d;
uint16_t t;
@@ -739,10 +739,10 @@
d = *dst;
if (d)
{
- m = IcAdd(s,d,0,t);
- n = IcAdd(s,d,8,t);
- o = IcAdd(s,d,16,t);
- p = IcAdd(s,d,24,t);
+ m = FbAdd(s,d,0,t);
+ n = FbAdd(s,d,8,t);
+ o = FbAdd(s,d,16,t);
+ p = FbAdd(s,d,24,t);
s = m|n|o|p;
}
}
@@ -768,14 +768,14 @@
uint16_t height)
{
FbBits *dstBits, *srcBits;
- IcStride dstStride, srcStride;
+ FbStride dstStride, srcStride;
int dstBpp, srcBpp;
int dstXoff, dstYoff;
int srcXoff, srcYoff;
- IcGetPixels(iSrc->pixels, srcBits, srcStride, srcBpp, srcXoff, srcYoff);
+ FbGetPixels(iSrc->pixels, srcBits, srcStride, srcBpp, srcXoff, srcYoff);
- IcGetPixels(iDst->pixels, dstBits, dstStride, dstBpp, dstXoff, dstYoff);
+ FbGetPixels(iDst->pixels, dstBits, dstStride, dstBpp, dstXoff, dstYoff);
fbBlt (srcBits + srcStride * (ySrc + srcYoff),
srcStride,
@@ -811,8 +811,8 @@
uint16_t height)
{
FbBits *dstBits;
- IcStip *maskBits;
- IcStride dstStride, maskStride;
+ FbStip *maskBits;
+ FbStride dstStride, maskStride;
int dstBpp, maskBpp;
int dstXoff, dstYoff;
int maskXoff, maskYoff;
@@ -827,8 +827,8 @@
width, height);
return;
}
- IcGetStipPixels (iMask->pixels, maskBits, maskStride, maskBpp, maskXoff, maskYoff);
- IcGetPixels (iDst->pixels, dstBits, dstStride, dstBpp, dstXoff, dstYoff);
+ FbGetStipPixels (iMask->pixels, maskBits, maskStride, maskBpp, maskXoff, maskYoff);
+ FbGetPixels (iDst->pixels, dstBits, dstStride, dstBpp, dstXoff, dstYoff);
switch (dstBpp) {
case 32:
@@ -907,7 +907,7 @@
region = pixman_region_create();
pixman_region_union_rect (region, region, xDst, yDst, width, height);
- if (!IcComputeCompositeRegion (region,
+ if (!FbComputeCompositeRegion (region,
iSrc,
iMask,
iDst,
@@ -1084,7 +1084,7 @@
break;
}
/* if we are transforming, we handle repeats in
- * IcFetch[a]_transform
+ * FbFetch[a]_transform
*/
if (iSrc->transform)
srcRepeat = 0;
Index: icblt.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/icblt.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- icblt.c 25 Jun 2005 01:28:19 -0000 1.9
+++ icblt.c 25 Jun 2005 03:13:19 -0000 1.10
@@ -38,11 +38,11 @@
void
fbBlt (FbBits *srcLine,
- IcStride srcStride,
+ FbStride srcStride,
int srcX,
FbBits *dstLine,
- IcStride dstStride,
+ FbStride dstStride,
int dstX,
int width,
@@ -62,7 +62,7 @@
int n, nmiddle;
int destInvarient;
int startbyte, endbyte;
- IcDeclareMergeRop ();
+ FbDeclareMergeRop ();
/* are we just copying multiples of 8 bits? if so, run, forrest, run!
the memcpy()'s should be pluggable ala mplayer|xine - perhaps we can get
@@ -89,15 +89,15 @@
}
#ifdef FB_24BIT
- if (bpp == 24 && !IcCheck24Pix (pm))
+ if (bpp == 24 && !FbCheck24Pix (pm))
{
fbBlt24 (srcLine, srcStride, srcX, dstLine, dstStride, dstX,
width, height, alu, pm, reverse, upsidedown);
return;
}
#endif
- IcInitializeMergeRop(alu, pm);
- destInvarient = IcDestInvarientMergeRop();
+ FbInitializeMergeRop(alu, pm);
+ destInvarient = FbDestInvarientMergeRop();
if (upsidedown)
{
srcLine += (height - 1) * (srcStride);
@@ -105,7 +105,7 @@
srcStride = -srcStride;
dstStride = -dstStride;
}
- IcMaskBitsBytes (dstX, width, destInvarient, startmask, startbyte,
+ FbMaskBitsBytes (dstX, width, destInvarient, startmask, startbyte,
nmiddle, endmask, endbyte);
if (reverse)
{
@@ -135,13 +135,13 @@
{
bits = *--src;
--dst;
- IcDoRightMaskByteMergeRop(dst, bits, endbyte, endmask);
+ FbDoRightMaskByteMergeRop(dst, bits, endbyte, endmask);
}
n = nmiddle;
if (destInvarient)
{
while (n--)
- *--dst = IcDoDestInvarientMergeRop(*--src);
+ *--dst = FbDoDestInvarientMergeRop(*--src);
}
else
{
@@ -149,14 +149,14 @@
{
bits = *--src;
--dst;
- *dst = IcDoMergeRop (bits, *dst);
+ *dst = FbDoMergeRop (bits, *dst);
}
}
if (startmask)
{
bits = *--src;
--dst;
- IcDoLeftMaskByteMergeRop(dst, bits, startbyte, startmask);
+ FbDoLeftMaskByteMergeRop(dst, bits, startbyte, startmask);
}
}
else
@@ -164,7 +164,7 @@
if (startmask)
{
bits = *src++;
- IcDoLeftMaskByteMergeRop(dst, bits, startbyte, startmask);
+ FbDoLeftMaskByteMergeRop(dst, bits, startbyte, startmask);
dst++;
}
n = nmiddle;
@@ -194,21 +194,21 @@
}
#endif
while (n--)
- *dst++ = IcDoDestInvarientMergeRop(*src++);
+ *dst++ = FbDoDestInvarientMergeRop(*src++);
}
else
{
while (n--)
{
bits = *src++;
- *dst = IcDoMergeRop (bits, *dst);
+ *dst = FbDoMergeRop (bits, *dst);
dst++;
}
}
if (endmask)
{
bits = *src;
- IcDoRightMaskByteMergeRop(dst, bits, endbyte, endmask);
+ FbDoRightMaskByteMergeRop(dst, bits, endbyte, endmask);
}
}
}
@@ -239,48 +239,48 @@
bits1 = *--src;
if (endmask)
{
- bits = IcScrRight(bits1, rightShift);
- if (IcScrRight(endmask, leftShift))
+ bits = FbScrRight(bits1, rightShift);
+ if (FbScrRight(endmask, leftShift))
{
bits1 = *--src;
- bits |= IcScrLeft(bits1, leftShift);
+ bits |= FbScrLeft(bits1, leftShift);
}
--dst;
- IcDoRightMaskByteMergeRop(dst, bits, endbyte, endmask);
+ FbDoRightMaskByteMergeRop(dst, bits, endbyte, endmask);
}
n = nmiddle;
if (destInvarient)
{
while (n--)
{
- bits = IcScrRight(bits1, rightShift);
+ bits = FbScrRight(bits1, rightShift);
bits1 = *--src;
- bits |= IcScrLeft(bits1, leftShift);
+ bits |= FbScrLeft(bits1, leftShift);
--dst;
- *dst = IcDoDestInvarientMergeRop(bits);
+ *dst = FbDoDestInvarientMergeRop(bits);
}
}
else
{
while (n--)
{
- bits = IcScrRight(bits1, rightShift);
+ bits = FbScrRight(bits1, rightShift);
bits1 = *--src;
- bits |= IcScrLeft(bits1, leftShift);
+ bits |= FbScrLeft(bits1, leftShift);
--dst;
- *dst = IcDoMergeRop(bits, *dst);
+ *dst = FbDoMergeRop(bits, *dst);
}
}
if (startmask)
{
- bits = IcScrRight(bits1, rightShift);
- if (IcScrRight(startmask, leftShift))
+ bits = FbScrRight(bits1, rightShift);
+ if (FbScrRight(startmask, leftShift))
{
bits1 = *--src;
- bits |= IcScrLeft(bits1, leftShift);
+ bits |= FbScrLeft(bits1, leftShift);
}
--dst;
- IcDoLeftMaskByteMergeRop (dst, bits, startbyte, startmask);
+ FbDoLeftMaskByteMergeRop (dst, bits, startbyte, startmask);
}
}
else
@@ -289,10 +289,10 @@
bits1 = *src++;
if (startmask)
{
- bits = IcScrLeft(bits1, leftShift);
+ bits = FbScrLeft(bits1, leftShift);
bits1 = *src++;
- bits |= IcScrRight(bits1, rightShift);
- IcDoLeftMaskByteMergeRop (dst, bits, startbyte, startmask);
+ bits |= FbScrRight(bits1, rightShift);
+ FbDoLeftMaskByteMergeRop (dst, bits, startbyte, startmask);
dst++;
}
n = nmiddle;
@@ -300,10 +300,10 @@
{
while (n--)
{
- bits = IcScrLeft(bits1, leftShift);
+ bits = FbScrLeft(bits1, leftShift);
bits1 = *src++;
- bits |= IcScrRight(bits1, rightShift);
- *dst = IcDoDestInvarientMergeRop(bits);
+ bits |= FbScrRight(bits1, rightShift);
+ *dst = FbDoDestInvarientMergeRop(bits);
dst++;
}
}
@@ -311,22 +311,22 @@
{
while (n--)
{
- bits = IcScrLeft(bits1, leftShift);
+ bits = FbScrLeft(bits1, leftShift);
bits1 = *src++;
- bits |= IcScrRight(bits1, rightShift);
- *dst = IcDoMergeRop(bits, *dst);
+ bits |= FbScrRight(bits1, rightShift);
+ *dst = FbDoMergeRop(bits, *dst);
dst++;
}
}
if (endmask)
{
- bits = IcScrLeft(bits1, leftShift);
- if (IcScrLeft(endmask, rightShift))
+ bits = FbScrLeft(bits1, leftShift);
+ if (FbScrLeft(endmask, rightShift))
{
bits1 = *src;
- bits |= IcScrRight(bits1, rightShift);
+ bits |= FbScrRight(bits1, rightShift);
}
- IcDoRightMaskByteMergeRop (dst, bits, endbyte, endmask);
+ FbDoRightMaskByteMergeRop (dst, bits, endbyte, endmask);
}
}
}
@@ -378,10 +378,10 @@
FbBits mask;
int rot;
- IcDeclareMergeRop ();
+ FbDeclareMergeRop ();
- IcInitializeMergeRop (alu, FB_ALLONES);
- IcMaskBits(dstX, width, startmask, n, endmask);
+ FbInitializeMergeRop (alu, FB_ALLONES);
+ FbMaskBits(dstX, width, startmask, n, endmask);
#ifdef DEBUG_BLT24
ErrorF ("dstX %d width %d reverse %d\n", dstX, width, reverse);
#endif
@@ -389,8 +389,8 @@
{
src += ((srcX + width - 1) >> FB_SHIFT) + 1;
dst += ((dstX + width - 1) >> FB_SHIFT) + 1;
- rot = IcFirst24Rot (((dstX + width - 8) & FB_MASK));
- rot = IcPrev24Rot(rot);
+ rot = FbFirst24Rot (((dstX + width - 8) & FB_MASK));
+ rot = FbPrev24Rot(rot);
#ifdef DEBUG_BLT24
ErrorF ("dstX + width - 8: %d rot: %d\n", (dstX + width - 8) & FB_MASK, rot);
#endif
@@ -403,12 +403,12 @@
dst += dstX >> FB_SHIFT;
srcX &= FB_MASK;
dstX &= FB_MASK;
- rot = IcFirst24Rot (dstX);
+ rot = FbFirst24Rot (dstX);
#ifdef DEBUG_BLT24
ErrorF ("dstX: %d rot: %d\n", dstX, rot);
#endif
}
- mask = IcRot24(pm,rot);
+ mask = FbRot24(pm,rot);
#ifdef DEBUG_BLT24
ErrorF ("pm 0x%x mask 0x%x\n", pm, mask);
#endif
@@ -420,21 +420,21 @@
{
bits = *--src;
--dst;
- *dst = IcDoMaskMergeRop (bits, *dst, mask & endmask);
- mask = IcPrev24Pix (mask);
+ *dst = FbDoMaskMergeRop (bits, *dst, mask & endmask);
+ mask = FbPrev24Pix (mask);
}
while (n--)
{
bits = *--src;
--dst;
- *dst = IcDoMaskMergeRop (bits, *dst, mask);
- mask = IcPrev24Pix (mask);
+ *dst = FbDoMaskMergeRop (bits, *dst, mask);
+ mask = FbPrev24Pix (mask);
}
if (startmask)
{
bits = *--src;
--dst;
- *dst = IcDoMaskMergeRop(bits, *dst, mask & startmask);
+ *dst = FbDoMaskMergeRop(bits, *dst, mask & startmask);
}
}
else
@@ -442,21 +442,21 @@
if (startmask)
{
bits = *src++;
- *dst = IcDoMaskMergeRop (bits, *dst, mask & startmask);
+ *dst = FbDoMaskMergeRop (bits, *dst, mask & startmask);
dst++;
- mask = IcNext24Pix(mask);
+ mask = FbNext24Pix(mask);
}
while (n--)
{
bits = *src++;
- *dst = IcDoMaskMergeRop (bits, *dst, mask);
+ *dst = FbDoMaskMergeRop (bits, *dst, mask);
dst++;
- mask = IcNext24Pix(mask);
+ mask = FbNext24Pix(mask);
}
if (endmask)
{
bits = *src;
- *dst = IcDoMaskMergeRop(bits, *dst, mask & endmask);
+ *dst = FbDoMaskMergeRop(bits, *dst, mask & endmask);
}
}
}
@@ -480,35 +480,35 @@
bits1 = *--src;
if (endmask)
{
- bits = IcScrRight(bits1, rightShift);
- if (IcScrRight(endmask, leftShift))
+ bits = FbScrRight(bits1, rightShift);
+ if (FbScrRight(endmask, leftShift))
{
bits1 = *--src;
- bits |= IcScrLeft(bits1, leftShift);
+ bits |= FbScrLeft(bits1, leftShift);
}
--dst;
- *dst = IcDoMaskMergeRop (bits, *dst, mask & endmask);
- mask = IcPrev24Pix(mask);
+ *dst = FbDoMaskMergeRop (bits, *dst, mask & endmask);
+ mask = FbPrev24Pix(mask);
}
while (n--)
{
- bits = IcScrRight(bits1, rightShift);
+ bits = FbScrRight(bits1, rightShift);
bits1 = *--src;
- bits |= IcScrLeft(bits1, leftShift);
+ bits |= FbScrLeft(bits1, leftShift);
--dst;
- *dst = IcDoMaskMergeRop(bits, *dst, mask);
- mask = IcPrev24Pix(mask);
+ *dst = FbDoMaskMergeRop(bits, *dst, mask);
+ mask = FbPrev24Pix(mask);
}
if (startmask)
{
- bits = IcScrRight(bits1, rightShift);
- if (IcScrRight(startmask, leftShift))
+ bits = FbScrRight(bits1, rightShift);
+ if (FbScrRight(startmask, leftShift))
{
bits1 = *--src;
- bits |= IcScrLeft(bits1, leftShift);
+ bits |= FbScrLeft(bits1, leftShift);
}
--dst;
- *dst = IcDoMaskMergeRop (bits, *dst, mask & startmask);
+ *dst = FbDoMaskMergeRop (bits, *dst, mask & startmask);
}
}
else
@@ -517,31 +517,31 @@
bits1 = *src++;
if (startmask)
{
- bits = IcScrLeft(bits1, leftShift);
+ bits = FbScrLeft(bits1, leftShift);
bits1 = *src++;
- bits |= IcScrRight(bits1, rightShift);
- *dst = IcDoMaskMergeRop (bits, *dst, mask & startmask);
+ bits |= FbScrRight(bits1, rightShift);
+ *dst = FbDoMaskMergeRop (bits, *dst, mask & startmask);
dst++;
- mask = IcNext24Pix(mask);
+ mask = FbNext24Pix(mask);
}
while (n--)
{
- bits = IcScrLeft(bits1, leftShift);
+ bits = FbScrLeft(bits1, leftShift);
bits1 = *src++;
- bits |= IcScrRight(bits1, rightShift);
- *dst = IcDoMaskMergeRop(bits, *dst, mask);
+ bits |= FbScrRight(bits1, rightShift);
+ *dst = FbDoMaskMergeRop(bits, *dst, mask);
dst++;
- mask = IcNext24Pix(mask);
+ mask = FbNext24Pix(mask);
}
if (endmask)
{
- bits = IcScrLeft(bits1, leftShift);
- if (IcScrLeft(endmask, rightShift))
+ bits = FbScrLeft(bits1, leftShift);
+ if (FbScrLeft(endmask, rightShift))
{
bits1 = *src;
- bits |= IcScrRight(bits1, rightShift);
+ bits |= FbScrRight(bits1, rightShift);
}
- *dst = IcDoMaskMergeRop (bits, *dst, mask & endmask);
+ *dst = FbDoMaskMergeRop (bits, *dst, mask & endmask);
}
}
}
@@ -565,11 +565,11 @@
void
fbBlt24 (FbBits *srcLine,
- IcStride srcStride,
+ FbStride srcStride,
int srcX,
FbBits *dstLine,
- IcStride dstStride,
+ FbStride dstStride,
int dstX,
int width,
@@ -609,14 +609,14 @@
void
fbBltOdd (FbBits *srcLine,
- IcStride srcStrideEven,
- IcStride srcStrideOdd,
+ FbStride srcStrideEven,
+ FbStride srcStrideOdd,
int srcXEven,
int srcXOdd,
FbBits *dstLine,
- IcStride dstStrideEven,
- IcStride dstStrideOdd,
+ FbStride dstStrideEven,
+ FbStride dstStrideOdd,
int dstXEven,
int dstXOdd,
@@ -648,10 +648,10 @@
int destInvarient;
int even;
- IcDeclareMergeRop ();
+ FbDeclareMergeRop ();
- IcInitializeMergeRop (alu, pm);
- destInvarient = IcDestInvarientMergeRop();
+ FbInitializeMergeRop (alu, pm);
+ destInvarient = FbDestInvarientMergeRop();
srcLine += srcXEven >> FB_SHIFT;
dstLine += dstXEven >> FB_SHIFT;
@@ -660,8 +660,8 @@
srcXOdd &= FB_MASK;
dstXOdd &= FB_MASK;
- IcMaskBits(dstXEven, width, startmaskEven, nmiddleEven, endmaskEven);
- IcMaskBits(dstXOdd, width, startmaskOdd, nmiddleOdd, endmaskOdd);
+ FbMaskBits(dstXEven, width, startmaskEven, nmiddleEven, endmaskEven);
+ FbMaskBits(dstXOdd, width, startmaskOdd, nmiddleOdd, endmaskOdd);
even = 1;
InitializeShifts(srcXEven, dstXEven, leftShiftEven, rightShiftEven);
@@ -701,7 +701,7 @@
if (startmask)
{
bits = *src++;
- *dst = IcDoMaskMergeRop (bits, *dst, startmask);
+ *dst = FbDoMaskMergeRop (bits, *dst, startmask);
dst++;
}
n = nmiddle;
@@ -710,7 +710,7 @@
while (n--)
{
bits = *src++;
- *dst = IcDoDestInvarientMergeRop(bits);
+ *dst = FbDoDestInvarientMergeRop(bits);
dst++;
}
}
@@ -719,14 +719,14 @@
while (n--)
{
bits = *src++;
- *dst = IcDoMergeRop (bits, *dst);
+ *dst = FbDoMergeRop (bits, *dst);
dst++;
}
}
if (endmask)
{
bits = *src;
- *dst = IcDoMaskMergeRop(bits, *dst, endmask);
+ *dst = FbDoMaskMergeRop(bits, *dst, endmask);
}
}
else
@@ -736,10 +736,10 @@
bits = *src++;
if (startmask)
{
- bits1 = IcScrLeft(bits, leftShift);
+ bits1 = FbScrLeft(bits, leftShift);
bits = *src++;
- bits1 |= IcScrRight(bits, rightShift);
- *dst = IcDoMaskMergeRop (bits1, *dst, startmask);
+ bits1 |= FbScrRight(bits, rightShift);
+ *dst = FbDoMaskMergeRop (bits1, *dst, startmask);
dst++;
}
n = nmiddle;
@@ -747,10 +747,10 @@
{
while (n--)
{
- bits1 = IcScrLeft(bits, leftShift);
+ bits1 = FbScrLeft(bits, leftShift);
bits = *src++;
- bits1 |= IcScrRight(bits, rightShift);
- *dst = IcDoDestInvarientMergeRop(bits1);
+ bits1 |= FbScrRight(bits, rightShift);
+ *dst = FbDoDestInvarientMergeRop(bits1);
dst++;
}
}
@@ -758,22 +758,22 @@
{
while (n--)
{
- bits1 = IcScrLeft(bits, leftShift);
+ bits1 = FbScrLeft(bits, leftShift);
bits = *src++;
- bits1 |= IcScrRight(bits, rightShift);
- *dst = IcDoMergeRop(bits1, *dst);
+ bits1 |= FbScrRight(bits, rightShift);
+ *dst = FbDoMergeRop(bits1, *dst);
dst++;
}
}
if (endmask)
{
- bits1 = IcScrLeft(bits, leftShift);
- if (IcScrLeft(endmask, rightShift))
+ bits1 = FbScrLeft(bits, leftShift);
+ if (FbScrLeft(endmask, rightShift))
{
bits = *src;
- bits1 |= IcScrRight(bits, rightShift);
+ bits1 |= FbScrRight(bits, rightShift);
}
- *dst = IcDoMaskMergeRop (bits1, *dst, endmask);
+ *dst = FbDoMaskMergeRop (bits1, *dst, endmask);
}
}
}
@@ -782,14 +782,14 @@
#ifdef FB_24BIT
void
fbBltOdd24 (FbBits *srcLine,
- IcStride srcStrideEven,
- IcStride srcStrideOdd,
+ FbStride srcStrideEven,
+ FbStride srcStrideOdd,
int srcXEven,
int srcXOdd,
FbBits *dstLine,
- IcStride dstStrideEven,
- IcStride dstStrideOdd,
+ FbStride dstStrideEven,
+ FbStride dstStrideOdd,
int dstXEven,
int dstXOdd,
@@ -830,12 +830,12 @@
#if FB_STIP_SHIFT != FB_SHIFT
void
-fbSetBltOdd (IcStip *stip,
- IcStride stipStride,
+fbSetBltOdd (FbStip *stip,
+ FbStride stipStride,
int srcX,
FbBits **bits,
- IcStride *strideEven,
- IcStride *strideOdd,
+ FbStride *strideEven,
+ FbStride *strideOdd,
int *srcXEven,
int *srcXOdd)
{
@@ -847,23 +847,23 @@
*/
srcAdjust = (((int) stip) & (FB_MASK >> 3));
/*
- * IcStip units needed to align stride
+ * FbStip units needed to align stride
*/
strideAdjust = stipStride & (FB_MASK >> FB_STIP_SHIFT);
*bits = (FbBits *) ((char *) stip - srcAdjust);
if (srcAdjust)
{
- *strideEven = IcStipStrideToBitsStride (stipStride + 1);
- *strideOdd = IcStipStrideToBitsStride (stipStride);
+ *strideEven = FbStipStrideToBitsStride (stipStride + 1);
+ *strideOdd = FbStipStrideToBitsStride (stipStride);
*srcXEven = srcX + (srcAdjust << 3);
*srcXOdd = srcX + (srcAdjust << 3) - (strideAdjust << FB_STIP_SHIFT);
}
else
{
- *strideEven = IcStipStrideToBitsStride (stipStride);
- *strideOdd = IcStipStrideToBitsStride (stipStride + 1);
+ *strideEven = FbStipStrideToBitsStride (stipStride);
+ *strideOdd = FbStipStrideToBitsStride (stipStride + 1);
*srcXEven = srcX;
*srcXOdd = srcX + (strideAdjust << FB_STIP_SHIFT);
@@ -872,12 +872,12 @@
#endif
void
-fbBltStip (IcStip *src,
- IcStride srcStride, /* in IcStip units, not FbBits units */
+fbBltStip (FbStip *src,
+ FbStride srcStride, /* in FbStip units, not FbBits units */
int srcX,
- IcStip *dst,
- IcStride dstStride, /* in IcStip units, not FbBits units */
+ FbStip *dst,
+ FbStride dstStride, /* in FbStip units, not FbBits units */
int dstX,
int width,
@@ -891,8 +891,8 @@
if (FB_STIP_ODDSTRIDE(srcStride) || FB_STIP_ODDPTR(src) ||
FB_STIP_ODDSTRIDE(dstStride) || FB_STIP_ODDPTR(dst))
{
- IcStride srcStrideEven, srcStrideOdd;
- IcStride dstStrideEven, dstStrideOdd;
+ FbStride srcStrideEven, srcStrideOdd;
+ FbStride dstStrideEven, dstStrideOdd;
int srcXEven, srcXOdd;
int dstXEven, dstXOdd;
FbBits *s, *d;
@@ -914,7 +914,7 @@
&dstXEven, &dstXOdd);
#ifdef FB_24BIT
- if (bpp == 24 && !IcCheck24Pix (pm))
+ if (bpp == 24 && !FbCheck24Pix (pm))
{
fbBltOdd24 (s, srcStrideEven, srcStrideOdd,
srcXEven, srcXOdd,
@@ -939,9 +939,9 @@
else
#endif
{
- fbBlt ((FbBits *) src, IcStipStrideToBitsStride (srcStride),
+ fbBlt ((FbBits *) src, FbStipStrideToBitsStride (srcStride),
srcX,
- (FbBits *) dst, IcStipStrideToBitsStride (dstStride),
+ (FbBits *) dst, FbStipStrideToBitsStride (dstStride),
dstX,
width, height,
alu, pm, bpp, 0, 0);
Index: icbltone.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/icbltone.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- icbltone.c 25 Jun 2005 01:28:19 -0000 1.10
+++ icbltone.c 25 Jun 2005 03:13:19 -0000 1.11
@@ -48,8 +48,8 @@
#define LoadBits {\
if (leftShift) { \
bitsRight = *src++; \
- bits = (IcStipLeft (bitsLeft, leftShift) | \
- IcStipRight(bitsRight, rightShift)); \
+ bits = (FbStipLeft (bitsLeft, leftShift) | \
+ FbStipRight(bitsRight, rightShift)); \
bitsLeft = bitsRight; \
} else \
bits = *src++; \
@@ -57,7 +57,7 @@
#ifndef FBNOPIXADDR
-#define LaneCases1(n,a) case n: (void)IcLaneCase(n,a); break
+#define LaneCases1(n,a) case n: (void)FbLaneCase(n,a); break
#define LaneCases2(n,a) LaneCases1(n,a); LaneCases1(n+1,a)
#define LaneCases4(n,a) LaneCases2(n,a); LaneCases2(n+2,a)
#define LaneCases8(n,a) LaneCases4(n,a); LaneCases4(n+4,a)
@@ -135,11 +135,11 @@
#endif
void
-fbBltOne (IcStip *src,
- IcStride srcStride, /* IcStip units per scanline */
+fbBltOne (FbStip *src,
+ FbStride srcStride, /* FbStip units per scanline */
int srcX, /* bit position of source */
FbBits *dst,
- IcStride dstStride, /* FbBits units per scanline */
+ FbStride dstStride, /* FbBits units per scanline */
int dstX, /* bit position of dest */
int dstBpp, /* bits per destination unit */
@@ -153,11 +153,11 @@
{
const FbBits *icbits;
int pixelsPerDst; /* dst pixels per FbBits */
- int unitsPerSrc; /* src patterns per IcStip */
+ int unitsPerSrc; /* src patterns per FbStip */
int leftShift, rightShift; /* align source with dest */
FbBits startmask, endmask; /* dest scanline masks */
- IcStip bits=0, bitsLeft, bitsRight;/* source bits */
- IcStip left;
+ FbStip bits=0, bitsLeft, bitsRight;/* source bits */
+ FbStip left;
FbBits mask;
int nDst; /* dest longwords (w.o. end) */
int w;
@@ -190,7 +190,7 @@
pixelsPerDst = FB_UNIT / dstBpp;
/*
- * Number of source stipple patterns in IcStip
+ * Number of source stipple patterns in FbStip
*/
unitsPerSrc = FB_STIP_UNIT / pixelsPerDst;
@@ -209,7 +209,7 @@
srcX &= FB_STIP_MASK;
dstX &= FB_MASK;
- IcMaskBitsBytes(dstX, width, copy,
+ FbMaskBitsBytes(dstX, width, copy,
startmask, startbyte, nmiddle, endmask, endbyte);
/*
@@ -296,10 +296,10 @@
{
#if FB_UNIT > 32
if (pixelsPerDst == 16)
- mask = IcStipple16Bits(IcLeftStipBits(bits,16));
+ mask = FbStipple16Bits(FbLeftStipBits(bits,16));
else
#endif
- mask = icbits[IcLeftStipBits(bits,pixelsPerDst)];
+ mask = icbits[FbLeftStipBits(bits,pixelsPerDst)];
#ifndef FBNOPIXADDR
if (fbLane)
{
@@ -309,11 +309,11 @@
#endif
{
if (mask || !transparent)
- IcDoLeftMaskByteStippleRRop (dst, mask,
+ FbDoLeftMaskByteStippleRRop (dst, mask,
fgand, fgxor, bgand, bgxor,
startbyte, startmask);
}
- bits = IcStipLeft (bits, pixelsPerDst);
+ bits = FbStipLeft (bits, pixelsPerDst);
dst++;
n--;
w--;
@@ -330,13 +330,13 @@
{
#if FB_UNIT > 32
if (pixelsPerDst == 16)
- mask = IcStipple16Bits(IcLeftStipBits(bits,16));
+ mask = FbStipple16Bits(FbLeftStipBits(bits,16));
else
#endif
- mask = icbits[IcLeftStipBits(bits,pixelsPerDst)];
- *dst = IcOpaqueStipple (mask, fgxor, bgxor);
+ mask = icbits[FbLeftStipBits(bits,pixelsPerDst)];
+ *dst = FbOpaqueStipple (mask, fgxor, bgxor);
dst++;
- bits = IcStipLeft(bits, pixelsPerDst);
+ bits = FbStipLeft(bits, pixelsPerDst);
}
}
else
@@ -346,10 +346,10 @@
{
while (bits && n)
{
- switch (fbLane[IcLeftStipBits(bits,pixelsPerDst)]) {
+ switch (fbLane[FbLeftStipBits(bits,pixelsPerDst)]) {
LaneCases((uint8_t *) dst);
}
- bits = IcStipLeft(bits,pixelsPerDst);
+ bits = FbStipLeft(bits,pixelsPerDst);
dst++;
n--;
}
@@ -360,15 +360,15 @@
{
while (n--)
{
- left = IcLeftStipBits(bits,pixelsPerDst);
+ left = FbLeftStipBits(bits,pixelsPerDst);
if (left || !transparent)
{
mask = icbits[left];
- *dst = IcStippleRRop (*dst, mask,
+ *dst = FbStippleRRop (*dst, mask,
fgand, fgxor, bgand, bgxor);
}
dst++;
- bits = IcStipLeft(bits, pixelsPerDst);
+ bits = FbStipLeft(bits, pixelsPerDst);
}
}
}
@@ -394,10 +394,10 @@
}
#if FB_UNIT > 32
if (pixelsPerDst == 16)
- mask = IcStipple16Bits(IcLeftStipBits(bits,16));
+ mask = FbStipple16Bits(FbLeftStipBits(bits,16));
else
#endif
- mask = icbits[IcLeftStipBits(bits,pixelsPerDst)];
+ mask = icbits[FbLeftStipBits(bits,pixelsPerDst)];
#ifndef FBNOPIXADDR
if (fbLane)
{
@@ -407,7 +407,7 @@
#endif
{
if (mask || !transparent)
- IcDoRightMaskByteStippleRRop (dst, mask,
+ FbDoRightMaskByteStippleRRop (dst, mask,
fgand, fgxor, bgand, bgxor,
endbyte, endmask);
}
@@ -452,10 +452,10 @@
SelMask24(b,2,r) | \
SelMask24(b,3,r))
-#define IcStip24New(rot) (2 + (rot != 0))
-#define IcStip24Len 4
+#define FbStip24New(rot) (2 + (rot != 0))
+#define FbStip24Len 4
-static const FbBits fbStipple24Bits[3][1 << IcStip24Len] = {
+static const FbBits fbStipple24Bits[3][1 << FbStip24Len] = {
/* rotate 0 */
{
C4_24( 0, 0), C4_24( 1, 0), C4_24( 2, 0), C4_24( 3, 0),
@@ -486,14 +486,14 @@
(SelMask24(b,0,r) | \
SelMask24(b,1,r))
-#define IcStip24Len 2
+#define FbStip24Len 2
#if BITMAP_BIT_ORDER == MSBFirst
-#define IcStip24New(rot) (1 + (rot == 0))
+#define FbStip24New(rot) (1 + (rot == 0))
#else
-#define IcStip24New(rot) (1 + (rot == 8))
+#define FbStip24New(rot) (1 + (rot == 8))
#endif
-static const FbBits fbStipple24Bits[3][1 << IcStip24Len] = {
+static const FbBits fbStipple24Bits[3][1 << FbStip24Len] = {
/* rotate 0 */
{
C2_24( 0, 0), C2_24 ( 1, 0), C2_24 ( 2, 0), C2_24 ( 3, 0),
@@ -511,51 +511,51 @@
#if BITMAP_BIT_ORDER == LSBFirst
-#define IcMergeStip24Bits(left, right, new) \
- (IcStipLeft (left, new) | IcStipRight ((right), (IcStip24Len - (new))))
+#define FbMergeStip24Bits(left, right, new) \
+ (FbStipLeft (left, new) | FbStipRight ((right), (FbStip24Len - (new))))
-#define IcMergePartStip24Bits(left, right, llen, rlen) \
- (left | IcStipRight(right, llen))
+#define FbMergePartStip24Bits(left, right, llen, rlen) \
+ (left | FbStipRight(right, llen))
#else
-#define IcMergeStip24Bits(left, right, new) \
- ((IcStipLeft (left, new) & ((1 << IcStip24Len) - 1)) | right)
+#define FbMergeStip24Bits(left, right, new) \
+ ((FbStipLeft (left, new) & ((1 << FbStip24Len) - 1)) | right)
-#define IcMergePartStip24Bits(left, right, llen, rlen) \
- (IcStipLeft(left, rlen) | right)
+#define FbMergePartStip24Bits(left, right, llen, rlen) \
+ (FbStipLeft(left, rlen) | right)
#endif
#define fbFirstStipBits(len,stip) {\
int __len = (len); \
if (len <= remain) { \
- stip = IcLeftStipBits(bits, len); \
+ stip = FbLeftStipBits(bits, len); \
} else { \
- stip = IcLeftStipBits(bits, remain); \
+ stip = FbLeftStipBits(bits, remain); \
bits = *src++; \
__len = (len) - remain; \
- stip = IcMergePartStip24Bits(stip, IcLeftStipBits(bits, __len), \
+ stip = FbMergePartStip24Bits(stip, FbLeftStipBits(bits, __len), \
remain, __len); \
remain = FB_STIP_UNIT; \
} \
- bits = IcStipLeft (bits, __len); \
+ bits = FbStipLeft (bits, __len); \
remain -= __len; \
}
#define fbInitStipBits(offset,len,stip) {\
- bits = IcStipLeft (*src++,offset); \
+ bits = FbStipLeft (*src++,offset); \
remain = FB_STIP_UNIT - offset; \
fbFirstStipBits(len,stip); \
- stip = IcMergeStip24Bits (0, stip, len); \
+ stip = FbMergeStip24Bits (0, stip, len); \
}
#define fbNextStipBits(rot,stip) {\
- int __new = IcStip24New(rot); \
- IcStip __right; \
+ int __new = FbStip24New(rot); \
+ FbStip __right; \
fbFirstStipBits(__new, __right); \
- stip = IcMergeStip24Bits (stip, __right, __new); \
- rot = IcNext24Rot (rot); \
+ stip = FbMergeStip24Bits (stip, __right, __new); \
+ rot = FbNext24Rot (rot); \
}
/*
@@ -568,11 +568,11 @@
* and text
*/
void
-fbBltOne24 (IcStip *srcLine,
- IcStride srcStride, /* IcStip units per scanline */
+fbBltOne24 (FbStip *srcLine,
+ FbStride srcStride, /* FbStip units per scanline */
int srcX, /* bit position of source */
FbBits *dst,
- IcStride dstStride, /* FbBits units per scanline */
+ FbStride dstStride, /* FbBits units per scanline */
int dstX, /* bit position of dest */
int dstBpp, /* bits per destination unit */
@@ -584,10 +584,10 @@
FbBits bgand,
FbBits bgxor)
{
- IcStip *src;
+ FbStip *src;
FbBits leftMask, rightMask, mask;
int nlMiddle, nl;
- IcStip stip, bits;
+ FbStip stip, bits;
int remain;
int dstS;
int firstlen;
@@ -598,12 +598,12 @@
dst += dstX >> FB_SHIFT;
srcX &= FB_STIP_MASK;
dstX &= FB_MASK;
- rot0 = IcFirst24Rot (dstX);
+ rot0 = FbFirst24Rot (dstX);
- IcMaskBits (dstX, width, leftMask, nlMiddle, rightMask);
+ FbMaskBits (dstX, width, leftMask, nlMiddle, rightMask);
dstS = (dstX + 23) / 24;
- firstlen = IcStip24Len - dstS;
+ firstlen = FbStip24Len - dstS;
nDst = nlMiddle;
if (leftMask)
@@ -622,9 +622,9 @@
if (leftMask)
{
mask = fbStipple24Bits[rot >> 3][stip];
- *dst = (*dst & ~leftMask) | (IcOpaqueStipple (mask,
- IcRot24(fgxor, rot),
- IcRot24(bgxor, rot))
+ *dst = (*dst & ~leftMask) | (FbOpaqueStipple (mask,
+ FbRot24(fgxor, rot),
+ FbRot24(bgxor, rot))
& leftMask);
dst++;
fbNextStipBits(rot,stip);
@@ -633,18 +633,18 @@
while (nl--)
{
mask = fbStipple24Bits[rot>>3][stip];
- *dst = IcOpaqueStipple (mask,
- IcRot24(fgxor, rot),
- IcRot24(bgxor, rot));
+ *dst = FbOpaqueStipple (mask,
+ FbRot24(fgxor, rot),
+ FbRot24(bgxor, rot));
dst++;
fbNextStipBits(rot,stip);
}
if (rightMask)
{
mask = fbStipple24Bits[rot >> 3][stip];
- *dst = (*dst & ~rightMask) | (IcOpaqueStipple (mask,
- IcRot24(fgxor, rot),
- IcRot24(bgxor, rot))
+ *dst = (*dst & ~rightMask) | (FbOpaqueStipple (mask,
+ FbRot24(fgxor, rot),
+ FbRot24(bgxor, rot))
& rightMask);
}
dst += dstStride;
@@ -665,7 +665,7 @@
if (stip)
{
mask = fbStipple24Bits[rot >> 3][stip] & leftMask;
- *dst = (*dst & ~mask) | (IcRot24(fgxor, rot) & mask);
+ *dst = (*dst & ~mask) | (FbRot24(fgxor, rot) & mask);
}
dst++;
fbNextStipBits (rot, stip);
@@ -676,7 +676,7 @@
if (stip)
{
mask = fbStipple24Bits[rot>>3][stip];
- *dst = (*dst & ~mask) | (IcRot24(fgxor,rot) & mask);
+ *dst = (*dst & ~mask) | (FbRot24(fgxor,rot) & mask);
}
dst++;
fbNextStipBits (rot, stip);
@@ -686,7 +686,7 @@
if (stip)
{
mask = fbStipple24Bits[rot >> 3][stip] & rightMask;
- *dst = (*dst & ~mask) | (IcRot24(fgxor, rot) & mask);
+ *dst = (*dst & ~mask) | (FbRot24(fgxor, rot) & mask);
}
}
dst += dstStride;
@@ -703,11 +703,11 @@
if (leftMask)
{
mask = fbStipple24Bits[rot >> 3][stip];
- *dst = IcStippleRRopMask (*dst, mask,
- IcRot24(fgand, rot),
- IcRot24(fgxor, rot),
- IcRot24(bgand, rot),
- IcRot24(bgxor, rot),
+ *dst = FbStippleRRopMask (*dst, mask,
+ FbRot24(fgand, rot),
+ FbRot24(fgxor, rot),
+ FbRot24(bgand, rot),
+ FbRot24(bgxor, rot),
leftMask);
dst++;
fbNextStipBits(rot,stip);
@@ -716,22 +716,22 @@
while (nl--)
{
mask = fbStipple24Bits[rot >> 3][stip];
- *dst = IcStippleRRop (*dst, mask,
- IcRot24(fgand, rot),
- IcRot24(fgxor, rot),
- IcRot24(bgand, rot),
- IcRot24(bgxor, rot));
+ *dst = FbStippleRRop (*dst, mask,
+ FbRot24(fgand, rot),
+ FbRot24(fgxor, rot),
+ FbRot24(bgand, rot),
+ FbRot24(bgxor, rot));
dst++;
fbNextStipBits(rot,stip);
}
if (rightMask)
{
mask = fbStipple24Bits[rot >> 3][stip];
- *dst = IcStippleRRopMask (*dst, mask,
- IcRot24(fgand, rot),
- IcRot24(fgxor, rot),
- IcRot24(bgand, rot),
- IcRot24(bgxor, rot),
+ *dst = FbStippleRRopMask (*dst, mask,
+ FbRot24(fgand, rot),
+ FbRot24(fgxor, rot),
+ FbRot24(bgand, rot),
+ FbRot24(bgxor, rot),
rightMask);
}
dst += dstStride;
Index: iccolor.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/iccolor.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- iccolor.c 2 Mar 2005 15:43:33 -0000 1.9
+++ iccolor.c 25 Jun 2005 03:13:19 -0000 1.10
@@ -26,7 +26,7 @@
#ifdef ICINT_NEED_IC_ONES
/* Fall back on HACKMEM 169. */
int
-_IcOnes (unsigned long mask)
+_FbOnes (unsigned long mask)
{
register unsigned long y;
@@ -43,10 +43,10 @@
{
uint32_t r, g, b, a;
- r = color->red >> (16 - _IcOnes (format->redMask));
- g = color->green >> (16 - _IcOnes (format->greenMask));
- b = color->blue >> (16 - _IcOnes (format->blueMask));
- a = color->alpha >> (16 - _IcOnes (format->alphaMask));
+ r = color->red >> (16 - _FbOnes (format->redMask));
+ g = color->green >> (16 - _FbOnes (format->greenMask));
+ b = color->blue >> (16 - _FbOnes (format->blueMask));
+ a = color->alpha >> (16 - _FbOnes (format->alphaMask));
r = r << format->red;
g = g << format->green;
b = b << format->blue;
@@ -56,7 +56,7 @@
slim_hidden_def(pixman_color_to_pixel);
static uint16_t
-IcFillColor (uint32_t pixel, int bits)
+FbFillColor (uint32_t pixel, int bits)
{
while (bits < 16)
{
@@ -77,8 +77,8 @@
g = (pixel >> format->green) & format->greenMask;
b = (pixel >> format->blue) & format->blueMask;
a = (pixel >> format->alpha) & format->alphaMask;
- color->red = IcFillColor (r, _IcOnes (format->redMask));
- color->green = IcFillColor (r, _IcOnes (format->greenMask));
- color->blue = IcFillColor (r, _IcOnes (format->blueMask));
- color->alpha = IcFillColor (r, _IcOnes (format->alphaMask));
+ color->red = FbFillColor (r, _FbOnes (format->redMask));
+ color->green = FbFillColor (r, _FbOnes (format->greenMask));
+ color->blue = FbFillColor (r, _FbOnes (format->blueMask));
+ color->alpha = FbFillColor (r, _FbOnes (format->alphaMask));
}
Index: iccompose.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/iccompose.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- iccompose.c 25 Jun 2005 01:28:19 -0000 1.22
+++ iccompose.c 25 Jun 2005 03:13:19 -0000 1.23
@@ -55,18 +55,18 @@
if (a == 0xff)
return x;
- m = IcInU(x,0,a,t);
- n = IcInU(x,8,a,t);
- o = IcInU(x,16,a,t);
- p = IcInU(x,24,a,t);
+ m = FbInU(x,0,a,t);
+ n = FbInU(x,8,a,t);
+ o = FbInU(x,16,a,t);
+ p = FbInU(x,24,a,t);
return m|n|o|p;
}
-static IcCompSrc
+static FbCompSrc
fbCombineMaskC (FbCompositeOperand *src,
FbCompositeOperand *msk)
{
- IcCompSrc s;
+ FbCompSrc s;
uint32_t x;
uint32_t a;
uint16_t xa;
@@ -103,16 +103,16 @@
return s;
}
- m = IcInC(x,0,a,t);
- n = IcInC(x,8,a,t);
- o = IcInC(x,16,a,t);
- p = IcInC(x,24,a,t);
+ m = FbInC(x,0,a,t);
+ n = FbInC(x,8,a,t);
+ o = FbInC(x,16,a,t);
+ p = FbInC(x,24,a,t);
s.value = m|n|o|p;
xa = x >> 24;
- m = IcInU(a,0,xa,t);
- n = IcInU(a,8,xa,t);
- o = IcInU(a,16,xa,t);
- p = IcInU(a,24,xa,t);
+ m = FbInU(a,0,xa,t);
+ n = FbInU(a,8,xa,t);
+ o = FbInU(a,16,xa,t);
+ p = FbInU(a,24,xa,t);
s.alpha = m|n|o|p;
return s;
}
@@ -139,10 +139,10 @@
if (a == 0xffffffff)
return x;
- m = IcInC(x,0,a,t);
- n = IcInC(x,8,a,t);
- o = IcInC(x,16,a,t);
- p = IcInC(x,24,a,t);
+ m = FbInC(x,0,a,t);
+ n = FbInC(x,8,a,t);
+ o = FbInC(x,16,a,t);
+ p = FbInC(x,24,a,t);
return m|n|o|p;
}
@@ -168,7 +168,7 @@
if (a == 0xff)
return x;
- return IcInU(x,24,a,t);
+ return FbInU(x,24,a,t);
}
static uint32_t
@@ -191,10 +191,10 @@
if (a == 0xffffffff)
return x;
- m = IcInC(x,0,a,t);
- n = IcInC(x,8,a,t);
- o = IcInC(x,16,a,t);
- p = IcInC(x,24,a,t);
+ m = FbInC(x,0,a,t);
+ n = FbInC(x,8,a,t);
+ o = FbInC(x,16,a,t);
+ p = FbInC(x,24,a,t);
return m|n|o|p;
}
@@ -250,10 +250,10 @@
if (a)
{
d = (*dst->fetch) (dst);
- m = IcOverU(s,d,0,a,t);
- n = IcOverU(s,d,8,a,t);
- o = IcOverU(s,d,16,a,t);
- p = IcOverU(s,d,24,a,t);
+ m = FbOverU(s,d,0,a,t);
+ n = FbOverU(s,d,8,a,t);
+ o = FbOverU(s,d,16,a,t);
+ p = FbOverU(s,d,24,a,t);
s = m|n|o|p;
}
(*dst->store) (dst, s);
@@ -265,7 +265,7 @@
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCompSrc cs;
+ FbCompSrc cs;
uint32_t s, d;
uint32_t a;
uint16_t t;
@@ -279,10 +279,10 @@
if (a)
{
d = (*dst->fetch) (dst);
- m = IcOverC(s,d,0,a,t);
- n = IcOverC(s,d,8,a,t);
- o = IcOverC(s,d,16,a,t);
- p = IcOverC(s,d,24,a,t);
+ m = FbOverC(s,d,0,a,t);
+ n = FbOverC(s,d,8,a,t);
+ o = FbOverC(s,d,16,a,t);
+ p = FbOverC(s,d,24,a,t);
s = m|n|o|p;
}
(*dst->store) (dst, s);
@@ -306,10 +306,10 @@
s = fbCombineMaskU (src, msk);
if (a != 0xff)
{
- m = IcOverU(d,s,0,a,t);
- n = IcOverU(d,s,8,a,t);
- o = IcOverU(d,s,16,a,t);
- p = IcOverU(d,s,24,a,t);
+ m = FbOverU(d,s,0,a,t);
+ n = FbOverU(d,s,8,a,t);
+ o = FbOverU(d,s,16,a,t);
+ p = FbOverU(d,s,24,a,t);
s = m|n|o|p;
}
(*dst->store) (dst, s);
@@ -333,10 +333,10 @@
s = fbCombineMaskValueC (src, msk);
if (a != 0xff)
{
- m = IcOverU(d,s,0,a,t);
- n = IcOverU(d,s,8,a,t);
- o = IcOverU(d,s,16,a,t);
- p = IcOverU(d,s,24,a,t);
+ m = FbOverU(d,s,0,a,t);
+ n = FbOverU(d,s,8,a,t);
+ o = FbOverU(d,s,16,a,t);
+ p = FbOverU(d,s,24,a,t);
s = m|n|o|p;
}
(*dst->store) (dst, s);
@@ -361,10 +361,10 @@
s = fbCombineMaskU (src, msk);
if (a != 0xff)
{
- m = IcInU(s,0,a,t);
- n = IcInU(s,8,a,t);
- o = IcInU(s,16,a,t);
- p = IcInU(s,24,a,t);
+ m = FbInU(s,0,a,t);
+ n = FbInU(s,8,a,t);
+ o = FbInU(s,16,a,t);
+ p = FbInU(s,24,a,t);
s = m|n|o|p;
}
}
@@ -389,10 +389,10 @@
s = fbCombineMaskValueC (src, msk);
if (a != 0xff)
{
- m = IcInU(s,0,a,t);
- n = IcInU(s,8,a,t);
- o = IcInU(s,16,a,t);
- p = IcInU(s,24,a,t);
+ m = FbInU(s,0,a,t);
+ n = FbInU(s,8,a,t);
+ o = FbInU(s,16,a,t);
+ p = FbInU(s,24,a,t);
s = m|n|o|p;
}
}
@@ -417,10 +417,10 @@
if (a)
{
d = (*dst->fetch) (dst);
- m = IcInU(d,0,a,t);
- n = IcInU(d,8,a,t);
- o = IcInU(d,16,a,t);
- p = IcInU(d,24,a,t);
+ m = FbInU(d,0,a,t);
+ n = FbInU(d,8,a,t);
+ o = FbInU(d,16,a,t);
+ p = FbInU(d,24,a,t);
d = m|n|o|p;
}
(*dst->store) (dst, d);
@@ -445,10 +445,10 @@
if (a)
{
d = (*dst->fetch) (dst);
- m = IcInC(d,0,a,t);
- n = IcInC(d,8,a,t);
- o = IcInC(d,16,a,t);
- p = IcInC(d,24,a,t);
+ m = FbInC(d,0,a,t);
+ n = FbInC(d,8,a,t);
+ o = FbInC(d,16,a,t);
+ p = FbInC(d,24,a,t);
d = m|n|o|p;
}
(*dst->store) (dst, d);
@@ -473,10 +473,10 @@
s = fbCombineMaskU (src, msk);
if (a != 0xff)
{
- m = IcInU(s,0,a,t);
- n = IcInU(s,8,a,t);
- o = IcInU(s,16,a,t);
- p = IcInU(s,24,a,t);
+ m = FbInU(s,0,a,t);
+ n = FbInU(s,8,a,t);
+ o = FbInU(s,16,a,t);
+ p = FbInU(s,24,a,t);
s = m|n|o|p;
}
}
@@ -501,10 +501,10 @@
s = fbCombineMaskValueC (src, msk);
if (a != 0xff)
{
- m = IcInU(s,0,a,t);
- n = IcInU(s,8,a,t);
- o = IcInU(s,16,a,t);
- p = IcInU(s,24,a,t);
+ m = FbInU(s,0,a,t);
+ n = FbInU(s,8,a,t);
+ o = FbInU(s,16,a,t);
+ p = FbInU(s,24,a,t);
s = m|n|o|p;
}
}
@@ -529,10 +529,10 @@
if (a)
{
d = (*dst->fetch) (dst);
- m = IcInU(d,0,a,t);
- n = IcInU(d,8,a,t);
- o = IcInU(d,16,a,t);
- p = IcInU(d,24,a,t);
+ m = FbInU(d,0,a,t);
+ n = FbInU(d,8,a,t);
+ o = FbInU(d,16,a,t);
+ p = FbInU(d,24,a,t);
d = m|n|o|p;
}
(*dst->store) (dst, d);
@@ -557,10 +557,10 @@
if (a)
{
d = (*dst->fetch) (dst);
- m = IcInC(d,0,a,t);
- n = IcInC(d,8,a,t);
- o = IcInC(d,16,a,t);
- p = IcInC(d,24,a,t);
+ m = FbInC(d,0,a,t);
+ n = FbInC(d,8,a,t);
+ o = FbInC(d,16,a,t);
+ p = FbInC(d,24,a,t);
d = m|n|o|p;
}
(*dst->store) (dst, d);
@@ -581,10 +581,10 @@
d = (*dst->fetch) (dst);
ad = ~s >> 24;
as = d >> 24;
- m = IcGen(s,d,0,as,ad,t,u,v);
- n = IcGen(s,d,8,as,ad,t,u,v);
- o = IcGen(s,d,16,as,ad,t,u,v);
- p = IcGen(s,d,24,as,ad,t,u,v);
+ m = FbGen(s,d,0,as,ad,t,u,v);
+ n = FbGen(s,d,8,as,ad,t,u,v);
+ o = FbGen(s,d,16,as,ad,t,u,v);
+ p = FbGen(s,d,24,as,ad,t,u,v);
(*dst->store) (dst, m|n|o|p);
}
@@ -593,7 +593,7 @@
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCompSrc cs;
+ FbCompSrc cs;
uint32_t s, d;
uint32_t ad;
uint16_t as;
@@ -605,10 +605,10 @@
s = cs.value;
ad = cs.alpha;
as = d >> 24;
- m = IcGen(s,d,0,as,IcGet8(ad,0),t,u,v);
- n = IcGen(s,d,8,as,IcGet8(ad,8),t,u,v);
- o = IcGen(s,d,16,as,IcGet8(ad,16),t,u,v);
- p = IcGen(s,d,24,as,IcGet8(ad,24),t,u,v);
+ m = FbGen(s,d,0,as,FbGet8(ad,0),t,u,v);
+ n = FbGen(s,d,8,as,FbGet8(ad,8),t,u,v);
+ o = FbGen(s,d,16,as,FbGet8(ad,16),t,u,v);
+ p = FbGen(s,d,24,as,FbGet8(ad,24),t,u,v);
(*dst->store) (dst, m|n|o|p);
}
@@ -626,10 +626,10 @@
d = (*dst->fetch) (dst);
ad = s >> 24;
as = ~d >> 24;
- m = IcGen(s,d,0,as,ad,t,u,v);
- n = IcGen(s,d,8,as,ad,t,u,v);
- o = IcGen(s,d,16,as,ad,t,u,v);
- p = IcGen(s,d,24,as,ad,t,u,v);
+ m = FbGen(s,d,0,as,ad,t,u,v);
+ n = FbGen(s,d,8,as,ad,t,u,v);
+ o = FbGen(s,d,16,as,ad,t,u,v);
+ p = FbGen(s,d,24,as,ad,t,u,v);
(*dst->store) (dst, m|n|o|p);
}
@@ -638,7 +638,7 @@
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCompSrc cs;
+ FbCompSrc cs;
uint32_t s, d, ad;
uint16_t as;
uint16_t t, u, v;
@@ -649,10 +649,10 @@
s = cs.value;
ad = cs.alpha;
as = ~d >> 24;
- m = IcGen(s,d,0,as,IcGet8(ad,0),t,u,v);
- n = IcGen(s,d,8,as,IcGet8(ad,8),t,u,v);
- o = IcGen(s,d,16,as,IcGet8(ad,16),t,u,v);
- p = IcGen(s,d,24,as,IcGet8(ad,24),t,u,v);
+ m = FbGen(s,d,0,as,FbGet8(ad,0),t,u,v);
+ n = FbGen(s,d,8,as,FbGet8(ad,8),t,u,v);
+ o = FbGen(s,d,16,as,FbGet8(ad,16),t,u,v);
+ p = FbGen(s,d,24,as,FbGet8(ad,24),t,u,v);
(*dst->store) (dst, m|n|o|p);
}
@@ -670,10 +670,10 @@
d = (*dst->fetch) (dst);
ad = ~s >> 24;
as = ~d >> 24;
- m = IcGen(s,d,0,as,ad,t,u,v);
- n = IcGen(s,d,8,as,ad,t,u,v);
- o = IcGen(s,d,16,as,ad,t,u,v);
- p = IcGen(s,d,24,as,ad,t,u,v);
+ m = FbGen(s,d,0,as,ad,t,u,v);
+ n = FbGen(s,d,8,as,ad,t,u,v);
+ o = FbGen(s,d,16,as,ad,t,u,v);
+ p = FbGen(s,d,24,as,ad,t,u,v);
(*dst->store) (dst, m|n|o|p);
}
@@ -682,7 +682,7 @@
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCompSrc cs;
+ FbCompSrc cs;
uint32_t s, d, ad;
uint16_t as;
uint16_t t, u, v;
@@ -693,10 +693,10 @@
s = cs.value;
ad = ~cs.alpha;
as = ~d >> 24;
- m = IcGen(s,d,0,as,ad,t,u,v);
- n = IcGen(s,d,8,as,ad,t,u,v);
- o = IcGen(s,d,16,as,ad,t,u,v);
- p = IcGen(s,d,24,as,ad,t,u,v);
+ m = FbGen(s,d,0,as,ad,t,u,v);
+ n = FbGen(s,d,8,as,ad,t,u,v);
+ o = FbGen(s,d,16,as,ad,t,u,v);
+ p = FbGen(s,d,24,as,ad,t,u,v);
(*dst->store) (dst, m|n|o|p);
}
@@ -717,10 +717,10 @@
d = (*dst->fetch) (dst);
if (s && d != ~0)
{
- m = IcAdd(s,d,0,t);
- n = IcAdd(s,d,8,t);
- o = IcAdd(s,d,16,t);
- p = IcAdd(s,d,24,t);
+ m = FbAdd(s,d,0,t);
+ n = FbAdd(s,d,8,t);
+ o = FbAdd(s,d,16,t);
+ p = FbAdd(s,d,24,t);
(*dst->store) (dst, m|n|o|p);
}
}
@@ -743,10 +743,10 @@
d = (*dst->fetch) (dst);
if (s && d != ~0)
{
- m = IcAdd(s,d,0,t);
- n = IcAdd(s,d,8,t);
- o = IcAdd(s,d,16,t);
- p = IcAdd(s,d,24,t);
+ m = FbAdd(s,d,0,t);
+ n = FbAdd(s,d,8,t);
+ o = FbAdd(s,d,16,t);
+ p = FbAdd(s,d,24,t);
(*dst->store) (dst, m|n|o|p);
}
}
@@ -800,7 +800,7 @@
b = ~b; /* 1 - b */
if (b >= a) /* 1 - b >= a -> (1-b)/a >= 1 */
return 0xff; /* 1 */
- return IcIntDiv(b,a); /* (1-b) / a */
+ return FbIntDiv(b,a); /* (1-b) / a */
}
/* portion covered by both a and b */
@@ -814,7 +814,7 @@
b = ~b; /* 1 - b */
if (b >= a) /* 1 - b >= a -> (1-b)/a >= 1 */
return 0; /* 1 - 1 */
- return ~IcIntDiv(b,a); /* 1 - (1-b) / a */
+ return ~FbIntDiv(b,a); /* 1 - (1-b) / a */
}
static void
@@ -863,10 +863,10 @@
Fb = 0xff;
break;
}
- m = IcGen (s,d,0,Fa,Fb,t,u,v);
- n = IcGen (s,d,8,Fa,Fb,t,u,v);
- o = IcGen (s,d,16,Fa,Fb,t,u,v);
- p = IcGen (s,d,24,Fa,Fb,t,u,v);
+ m = FbGen (s,d,0,Fa,Fb,t,u,v);
+ n = FbGen (s,d,8,Fa,Fb,t,u,v);
+ o = FbGen (s,d,16,Fa,Fb,t,u,v);
+ p = FbGen (s,d,24,Fa,Fb,t,u,v);
s = m|n|o|p;
(*dst->store) (dst, s);
}
@@ -877,7 +877,7 @@
FbCompositeOperand *dst,
uint8_t combine)
{
- IcCompSrc cs;
+ FbCompSrc cs;
uint32_t s, d;
uint32_t m,n,o,p;
uint32_t Fa;
@@ -929,10 +929,10 @@
Fb = 0xff;
break;
}
- m = IcGen (s,d,0,IcGet8(Fa,0),Fb,t,u,v);
- n = IcGen (s,d,8,IcGet8(Fa,8),Fb,t,u,v);
- o = IcGen (s,d,16,IcGet8(Fa,16),Fb,t,u,v);
- p = IcGen (s,d,24,IcGet8(Fa,24),Fb,t,u,v);
+ m = FbGen (s,d,0,FbGet8(Fa,0),Fb,t,u,v);
+ n = FbGen (s,d,8,FbGet8(Fa,8),Fb,t,u,v);
+ o = FbGen (s,d,16,FbGet8(Fa,16),Fb,t,u,v);
+ p = FbGen (s,d,24,FbGet8(Fa,24),Fb,t,u,v);
s = m|n|o|p;
(*dst->store) (dst, s);
}
@@ -955,10 +955,10 @@
{
d = (*dst->fetch) (dst);
a = fbCombineDisjointOutPart (d >> 24, a);
- m = IcOverU(s,d,0,a,t);
- n = IcOverU(s,d,8,a,t);
- o = IcOverU(s,d,16,a,t);
- p = IcOverU(s,d,24,a,t);
+ m = FbOverU(s,d,0,a,t);
+ n = FbOverU(s,d,8,a,t);
+ o = FbOverU(s,d,16,a,t);
+ p = FbOverU(s,d,24,a,t);
s = m|n|o|p;
}
(*dst->store) (dst, s);
@@ -1112,7 +1112,7 @@
if (b >= a) /* b >= a -> b/a >= 1 */
return 0x00; /* 0 */
- return ~IcIntDiv(b,a); /* 1 - b/a */
+ return ~FbIntDiv(b,a); /* 1 - b/a */
}
/* portion covered by both a and b */
@@ -1123,7 +1123,7 @@
if (b >= a) /* b >= a -> b/a >= 1 */
return 0xff; /* 1 */
- return IcIntDiv(b,a); /* b/a */
+ return FbIntDiv(b,a); /* b/a */
}
static void
@@ -1172,10 +1172,10 @@
Fb = 0xff;
break;
}
- m = IcGen (s,d,0,Fa,Fb,t,u,v);
- n = IcGen (s,d,8,Fa,Fb,t,u,v);
- o = IcGen (s,d,16,Fa,Fb,t,u,v);
- p = IcGen (s,d,24,Fa,Fb,t,u,v);
+ m = FbGen (s,d,0,Fa,Fb,t,u,v);
+ n = FbGen (s,d,8,Fa,Fb,t,u,v);
+ o = FbGen (s,d,16,Fa,Fb,t,u,v);
+ p = FbGen (s,d,24,Fa,Fb,t,u,v);
s = m|n|o|p;
(*dst->store) (dst, s);
}
@@ -1186,7 +1186,7 @@
FbCompositeOperand *dst,
uint8_t combine)
{
- IcCompSrc cs;
+ FbCompSrc cs;
uint32_t s, d;
uint32_t m,n,o,p;
uint32_t Fa;
@@ -1238,10 +1238,10 @@
Fb = 0xff;
break;
}
- m = IcGen (s,d,0,IcGet8(Fa,0),Fb,t,u,v);
- n = IcGen (s,d,8,IcGet8(Fa,8),Fb,t,u,v);
- o = IcGen (s,d,16,IcGet8(Fa,16),Fb,t,u,v);
- p = IcGen (s,d,24,IcGet8(Fa,24),Fb,t,u,v);
+ m = FbGen (s,d,0,FbGet8(Fa,0),Fb,t,u,v);
+ n = FbGen (s,d,8,FbGet8(Fa,8),Fb,t,u,v);
+ o = FbGen (s,d,16,FbGet8(Fa,16),Fb,t,u,v);
+ p = FbGen (s,d,24,FbGet8(Fa,24),Fb,t,u,v);
s = m|n|o|p;
(*dst->store) (dst, s);
}
@@ -1266,10 +1266,10 @@
{
d = (*dst->fetch) (dst);
a = fbCombineConjointOutPart (d >> 24, a);
- m = IcOverU(s,d,0,a,t);
- n = IcOverU(s,d,8,a,t);
- o = IcOverU(s,d,16,a,t);
- p = IcOverU(s,d,24,a,t);
+ m = FbOverU(s,d,0,a,t);
+ n = FbOverU(s,d,8,a,t);
+ o = FbOverU(s,d,16,a,t);
+ p = FbOverU(s,d,24,a,t);
s = m|n|o|p;
}
(*dst->store) (dst, s);
@@ -1413,7 +1413,7 @@
fbCombineConjointGeneralC (src, msk, dst, CombineXor);
}
-static IcCombineFunc const fbCombineFuncU[] = {
+static FbCombineFunc const fbCombineFuncU[] = {
fbCombineClear,
fbCombineSrcU,
fbCombineDst,
@@ -1460,7 +1460,7 @@
fbCombineConjointXorU,
};
-static IcCombineFunc const fbCombineFuncC[] = {
+static FbCombineFunc const fbCombineFuncC[] = {
fbCombineClear,
fbCombineSrcC,
fbCombineDst,
@@ -2210,7 +2210,7 @@
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t *pixel = ((uint32_t *) line) + (offset >> 5);
- uint32_t mask = IcStipMask(offset & 0x1f, 1);
+ uint32_t mask = FbStipMask(offset & 0x1f, 1);
value = value & 0x80000000 ? mask : 0;
*pixel = (*pixel & ~mask) | value;
@@ -2440,7 +2440,7 @@
return bits;
}
-static IcAccessMap const fbAccessMap[] = {
+static FbAccessMap const fbAccessMap[] = {
/* 32bpp formats */
{ PICT_a8r8g8b8, fbFetch_a8r8g8b8, fbFetch_a8r8g8b8, fbStore_a8r8g8b8 },
{ PICT_x8r8g8b8, fbFetch_x8r8g8b8, fbFetch_x8r8g8b8, fbStore_x8r8g8b8 },
@@ -2619,7 +2619,7 @@
if (fbAccessMap[i].format_code == image->format_code)
{
FbBits *bits;
- IcStride stride;
+ FbStride stride;
int bpp;
op->fetch = fbAccessMap[i].fetch;
@@ -2635,7 +2635,7 @@
else
op->src_clip = image->pSourceClip;
- IcGetPixels (image->pixels, bits, stride, bpp,
+ FbGetPixels (image->pixels, bits, stride, bpp,
xoff, yoff);
if (image->repeat && image->pixels->width == 1 &&
image->pixels->height == 1)
@@ -2682,7 +2682,7 @@
FbCompositeOperand *srcPict, *srcAlpha;
FbCompositeOperand *dstPict, *dstAlpha;
FbCompositeOperand *mskPict = 0, *mskAlpha = 0;
- IcCombineFunc f;
+ FbCombineFunc f;
int w;
if (!fbBuildCompositeOperand (iSrc, src, xSrc, ySrc, 1, 1))
Index: icformat.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/icformat.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- icformat.c 11 Mar 2005 20:09:00 -0000 1.13
+++ icformat.c 25 Jun 2005 03:13:19 -0000 1.14
@@ -76,10 +76,10 @@
type = PICT_TYPE_ABGR;
format_code = PICT_FORMAT (bpp, type,
- _IcOnes (alpha_mask),
- _IcOnes (red_mask),
- _IcOnes (green_mask),
- _IcOnes (blue_mask));
+ _FbOnes (alpha_mask),
+ _FbOnes (red_mask),
+ _FbOnes (green_mask),
+ _FbOnes (blue_mask));
format = malloc (sizeof (pixman_format_t));
if (format == NULL)
@@ -148,7 +148,7 @@
break;
}
- format->depth = _IcOnes ((format->alphaMask << format->alpha) |
+ format->depth = _FbOnes ((format->alphaMask << format->alpha) |
(format->redMask << format->red) |
(format->blueMask << format->blue) |
(format->greenMask << format->green));
Index: icimage.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/icimage.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- icimage.c 24 Jun 2005 02:35:45 -0000 1.29
+++ icimage.c 25 Jun 2005 03:13:19 -0000 1.30
@@ -29,15 +29,15 @@
int height)
{
pixman_image_t *image;
- IcPixels *pixels;
+ FbPixels *pixels;
- pixels = IcPixelsCreate (width, height, format->depth);
+ pixels = FbPixelsCreate (width, height, format->depth);
if (pixels == NULL)
return NULL;
image = pixman_image_createForPixels (pixels, format);
if (image == NULL) {
- IcPixelsDestroy (pixels);
+ FbPixelsDestroy (pixels);
return NULL;
}
@@ -51,15 +51,15 @@
pixman_image_create_for_data (FbBits *data, pixman_format_t *format, int width, int height, int bpp, int stride)
{
pixman_image_t *image;
- IcPixels *pixels;
+ FbPixels *pixels;
- pixels = IcPixelsCreateForData (data, width, height, format->depth, bpp, stride);
+ pixels = FbPixelsCreateForData (data, width, height, format->depth, bpp, stride);
if (pixels == NULL)
return NULL;
image = pixman_image_createForPixels (pixels, format);
if (image == NULL) {
- IcPixelsDestroy (pixels);
+ FbPixelsDestroy (pixels);
return NULL;
}
@@ -69,7 +69,7 @@
}
pixman_image_t *
-pixman_image_createForPixels (IcPixels *pixels,
+pixman_image_createForPixels (FbPixels *pixels,
pixman_format_t *format)
{
pixman_image_t *image;
@@ -265,7 +265,7 @@
}
if (image->owns_pixels) {
- IcPixelsDestroy (image->pixels);
+ FbPixelsDestroy (image->pixels);
image->pixels = NULL;
}
@@ -331,7 +331,7 @@
#define BOUND(v) (int16_t) ((v) < MINSHORT ? MINSHORT : (v) > MAXSHORT ? MAXSHORT : (v))
static __inline int
-IcClipImageReg (pixman_region16_t *region,
+FbClipImageReg (pixman_region16_t *region,
pixman_region16_t *clip,
int dx,
int dy)
@@ -367,7 +367,7 @@
}
static __inline int
-IcClipImageSrc (pixman_region16_t *region,
+FbClipImageSrc (pixman_region16_t *region,
pixman_image_t *image,
int dx,
int dy)
@@ -399,7 +399,7 @@
clip = image->pCompositeClip;
else
clip = image->pSourceClip;
- return IcClipImageReg (region,
+ return FbClipImageReg (region,
clip,
dx,
dy);
@@ -594,7 +594,7 @@
*/
int
-IcComputeCompositeRegion (pixman_region16_t *region,
+FbComputeCompositeRegion (pixman_region16_t *region,
pixman_image_t *iSrc,
pixman_image_t *iMask,
pixman_image_t *iDst,
@@ -629,14 +629,14 @@
return 1;
}
/* clip against src */
- if (!IcClipImageSrc (region, iSrc, xDst - xSrc, yDst - ySrc))
+ if (!FbClipImageSrc (region, iSrc, xDst - xSrc, yDst - ySrc))
{
pixman_region_destroy (region);
return 0;
}
if (iSrc->alphaMap)
{
- if (!IcClipImageSrc (region, iSrc->alphaMap,
+ if (!FbClipImageSrc (region, iSrc->alphaMap,
xDst - (xSrc + iSrc->alphaOrigin.x),
yDst - (ySrc + iSrc->alphaOrigin.y)))
{
@@ -647,14 +647,14 @@
/* clip against mask */
if (iMask)
{
- if (!IcClipImageSrc (region, iMask, xDst - xMask, yDst - yMask))
+ if (!FbClipImageSrc (region, iMask, xDst - xMask, yDst - yMask))
{
pixman_region_destroy (region);
return 0;
}
if (iMask->alphaMap)
{
- if (!IcClipImageSrc (region, iMask->alphaMap,
+ if (!FbClipImageSrc (region, iMask->alphaMap,
xDst - (xMask + iMask->alphaOrigin.x),
yDst - (yMask + iMask->alphaOrigin.y)))
{
@@ -663,14 +663,14 @@
}
}
}
- if (!IcClipImageReg (region, iDst->pCompositeClip, 0, 0))
+ if (!FbClipImageReg (region, iDst->pCompositeClip, 0, 0))
{
pixman_region_destroy (region);
return 0;
}
if (iDst->alphaMap)
{
- if (!IcClipImageReg (region, iDst->alphaMap->pCompositeClip,
+ if (!FbClipImageReg (region, iDst->alphaMap->pCompositeClip,
-iDst->alphaOrigin.x,
-iDst->alphaOrigin.y))
{
Index: icimage.h
===================================================================
RCS file: /cvs/cairo/libpixman/src/icimage.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- icimage.h 25 Jun 2005 01:28:19 -0000 1.25
+++ icimage.h 25 Jun 2005 03:13:19 -0000 1.26
@@ -34,10 +34,10 @@
*/
-#define IcIntMult(a,b,t) ( (t) = (a) * (b) + 0x80, ( ( ( (t)>>8 ) + (t) )>>8 ) )
-#define IcIntDiv(a,b) (((uint16_t) (a) * 255) / (b))
+#define FbIntMult(a,b,t) ( (t) = (a) * (b) + 0x80, ( ( ( (t)>>8 ) + (t) )>>8 ) )
+#define FbIntDiv(a,b) (((uint16_t) (a) * 255) / (b))
-#define IcGet8(v,i) ((uint16_t) (uint8_t) ((v) >> i))
+#define FbGet8(v,i) ((uint16_t) (uint8_t) ((v) >> i))
/*
* There are two ways of handling alpha -- either as a single unified value or
@@ -47,22 +47,22 @@
* this difference will have two versions using the same convention.
*/
-#define IcOverU(x,y,i,a,t) ((t) = IcIntMult(IcGet8(y,i),(a),(t)) + IcGet8(x,i),\
+#define FbOverU(x,y,i,a,t) ((t) = FbIntMult(FbGet8(y,i),(a),(t)) + FbGet8(x,i),\
(uint32_t) ((uint8_t) ((t) | (0 - ((t) >> 8)))) << (i))
-#define IcOverC(x,y,i,a,t) ((t) = IcIntMult(IcGet8(y,i),IcGet8(a,i),(t)) + IcGet8(x,i),\
+#define FbOverC(x,y,i,a,t) ((t) = FbIntMult(FbGet8(y,i),FbGet8(a,i),(t)) + FbGet8(x,i),\
(uint32_t) ((uint8_t) ((t) | (0 - ((t) >> 8)))) << (i))
-#define IcInU(x,i,a,t) ((uint32_t) IcIntMult(IcGet8(x,i),(a),(t)) << (i))
+#define FbInU(x,i,a,t) ((uint32_t) FbIntMult(FbGet8(x,i),(a),(t)) << (i))
-#define IcInC(x,i,a,t) ((uint32_t) IcIntMult(IcGet8(x,i),IcGet8(a,i),(t)) << (i))
+#define FbInC(x,i,a,t) ((uint32_t) FbIntMult(FbGet8(x,i),FbGet8(a,i),(t)) << (i))
-#define IcGen(x,y,i,ax,ay,t,u,v) ((t) = (IcIntMult(IcGet8(y,i),ay,(u)) + \
- IcIntMult(IcGet8(x,i),ax,(v))),\
+#define FbGen(x,y,i,ax,ay,t,u,v) ((t) = (FbIntMult(FbGet8(y,i),ay,(u)) + \
+ FbIntMult(FbGet8(x,i),ax,(v))),\
(uint32_t) ((uint8_t) ((t) | \
(0 - ((t) >> 8)))) << (i))
-#define IcAdd(x,y,i,t) ((t) = IcGet8(x,i) + IcGet8(y,i), \
+#define FbAdd(x,y,i,t) ((t) = FbGet8(x,i) + FbGet8(y,i), \
(uint32_t) ((uint8_t) ((t) | (0 - ((t) >> 8)))) << (i))
/*
@@ -87,7 +87,7 @@
*/
struct pixman_image {
- IcPixels *pixels;
+ FbPixels *pixels;
pixman_format_t image_format;
int format_code;
int refcnt;
@@ -105,9 +105,9 @@
unsigned int unused : 21;
struct pixman_image *alphaMap;
- IcPoint alphaOrigin;
+ FbPoint alphaOrigin;
- IcPoint clipOrigin;
+ FbPoint clipOrigin;
void *clientClip;
unsigned long dither;
@@ -135,28 +135,28 @@
#define IC_MAX_INDEXED 256 /* XXX depth must be <= 8 */
#if IC_MAX_INDEXED <= 256
-typedef uint8_t IcIndexType;
+typedef uint8_t FbIndexType;
#endif
/* XXX: We're not supporting indexed operations, right?
-typedef struct _IcIndexed {
+typedef struct _FbIndexed {
int color;
uint32_t rgba[IC_MAX_INDEXED];
- IcIndexType ent[32768];
-} IcIndexedRec, *IcIndexedPtr;
+ FbIndexType ent[32768];
+} FbIndexedRec, *FbIndexedPtr;
*/
-#define IcCvtR8G8B8to15(s) ((((s) >> 3) & 0x001f) | \
+#define FbCvtR8G8B8to15(s) ((((s) >> 3) & 0x001f) | \
(((s) >> 6) & 0x03e0) | \
(((s) >> 9) & 0x7c00))
-#define IcIndexToEnt15(icf,rgb15) ((icf)->ent[rgb15])
-#define IcIndexToEnt24(icf,rgb24) IcIndexToEnt15(icf,IcCvtR8G8B8to15(rgb24))
+#define FbIndexToEnt15(icf,rgb15) ((icf)->ent[rgb15])
+#define FbIndexToEnt24(icf,rgb24) FbIndexToEnt15(icf,FbCvtR8G8B8to15(rgb24))
-#define IcIndexToEntY24(icf,rgb24) ((icf)->ent[CvtR8G8B8toY15(rgb24)])
+#define FbIndexToEntY24(icf,rgb24) ((icf)->ent[CvtR8G8B8toY15(rgb24)])
/*
pixman_private int
-IcCreatePicture (PicturePtr pPicture);
+FbCreatePicture (PicturePtr pPicture);
*/
pixman_private void
@@ -167,14 +167,14 @@
/*
pixman_private void
-IcValidatePicture (PicturePtr pPicture,
+FbValidatePicture (PicturePtr pPicture,
Mask mask);
*/
/* XXX: What should this be?
pixman_private int
-IcClipPicture (pixman_region16_t *region,
+FbClipPicture (pixman_region16_t *region,
pixman_image_t *image,
int16_t xReg,
int16_t yReg,
@@ -183,7 +183,7 @@
*/
pixman_private int
-IcComputeCompositeRegion (pixman_region16_t *region,
+FbComputeCompositeRegion (pixman_region16_t *region,
pixman_image_t *iSrc,
pixman_image_t *iMask,
pixman_image_t *iDst,
@@ -201,12 +201,12 @@
/*
pixman_private int
-IcPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats);
+FbPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats);
*/
/*
pixman_private void
-IcGlyphs (pixman_operator_t op,
+FbGlyphs (pixman_operator_t op,
PicturePtr pSrc,
PicturePtr pDst,
PictFormatPtr maskFormat,
@@ -227,7 +227,7 @@
*/
pixman_private pixman_image_t *
-IcCreateAlphaPicture (pixman_image_t *dst,
+FbCreateAlphaPicture (pixman_image_t *dst,
pixman_format_t *format,
uint16_t width,
uint16_t height);
@@ -262,7 +262,7 @@
int start_offset;
pixman_bits_t *line;
uint32_t offset;
- IcStride stride;
+ FbStride stride;
int bpp;
} drawable;
struct {
@@ -289,29 +289,29 @@
pixman_compositeStep down;
pixman_compositeSet set;
/* XXX: We're not supporting indexed operations, right?
- IcIndexedPtr indexed;
+ FbIndexedPtr indexed;
*/
pixman_region16_t *dst_clip;
pixman_region16_t *src_clip;
};
-typedef void (*IcCombineFunc) (FbCompositeOperand *src,
+typedef void (*FbCombineFunc) (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst);
-typedef struct _IcAccessMap {
+typedef struct _FbAccessMap {
uint32_t format_code;
pixman_compositeFetch fetch;
pixman_compositeFetch fetcha;
pixman_compositeStore store;
-} IcAccessMap;
+} FbAccessMap;
/* iccompose.c */
-typedef struct _IcCompSrc {
+typedef struct _FbCompSrc {
uint32_t value;
uint32_t alpha;
-} IcCompSrc;
+} FbCompSrc;
pixman_private int
fbBuildCompositeOperand (pixman_image_t *image,
Index: icint.h
===================================================================
RCS file: /cvs/cairo/libpixman/src/icint.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- icint.h 25 Jun 2005 01:28:19 -0000 1.31
+++ icint.h 25 Jun 2005 03:13:19 -0000 1.32
@@ -54,9 +54,9 @@
*/
#define MOD(a, b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-(a) - 1) % (b) - 1)
-typedef struct _IcPoint {
+typedef struct _FbPoint {
int16_t x,y ;
-} IcPoint;
+} FbPoint;
typedef unsigned int Mask;
@@ -130,78 +130,78 @@
#define FB_STIP_SHIFT LOG2_BITMAP_PAD
#define FB_STIP_UNIT (1 << FB_STIP_SHIFT)
#define FB_STIP_MASK (FB_STIP_UNIT - 1)
-#define FB_STIP_ALLONES ((IcStip) -1)
+#define FB_STIP_ALLONES ((FbStip) -1)
#define FB_STIP_ODDSTRIDE(s) (((s) & (FB_MASK >> FB_STIP_SHIFT)) != 0)
#define FB_STIP_ODDPTR(p) ((((long) (p)) & (FB_MASK >> 3)) != 0)
-#define IcStipStrideToBitsStride(s) (((s) >> (FB_SHIFT - FB_STIP_SHIFT)))
-#define IcBitsStrideToStipStride(s) (((s) << (FB_SHIFT - FB_STIP_SHIFT)))
+#define FbStipStrideToBitsStride(s) (((s) >> (FB_SHIFT - FB_STIP_SHIFT)))
+#define FbBitsStrideToStipStride(s) (((s) << (FB_SHIFT - FB_STIP_SHIFT)))
-#define IcFullMask(n) ((n) == FB_UNIT ? FB_ALLONES : ((((pixman_bits_t) 1) << n) - 1))
+#define FbFullMask(n) ((n) == FB_UNIT ? FB_ALLONES : ((((pixman_bits_t) 1) << n) - 1))
-typedef uint32_t IcStip;
-typedef int IcStride;
+typedef uint32_t FbStip;
+typedef int FbStride;
#ifdef FB_DEBUG
extern void fbValidateDrawable(DrawablePtr d);
extern void fbInitializeDrawable(DrawablePtr d);
-extern void fbSetBits (IcStip *bits, int stride, IcStip data);
-#define FB_HEAD_BITS (IcStip) (0xbaadf00d)
-#define FB_TAIL_BITS (IcStip) (0xbaddf0ad)
+extern void fbSetBits (FbStip *bits, int stride, FbStip data);
+#define FB_HEAD_BITS (FbStip) (0xbaadf00d)
+#define FB_TAIL_BITS (FbStip) (0xbaddf0ad)
#else
#define fbValidateDrawable(d)
#define fdInitializeDrawable(d)
#endif
#if BITMAP_BIT_ORDER == LSBFirst
-#define IcScrLeft(x,n) ((x) >> (n))
-#define IcScrRight(x,n) ((x) << (n))
-/* #define IcLeftBits(x,n) ((x) & ((((pixman_bits_t) 1) << (n)) - 1)) */
-#define IcLeftStipBits(x,n) ((x) & ((((IcStip) 1) << (n)) - 1))
-#define IcStipMoveLsb(x,s,n) (IcStipRight (x,(s)-(n)))
-#define IcPatternOffsetBits 0
+#define FbScrLeft(x,n) ((x) >> (n))
+#define FbScrRight(x,n) ((x) << (n))
+/* #define FbLeftBits(x,n) ((x) & ((((pixman_bits_t) 1) << (n)) - 1)) */
+#define FbLeftStipBits(x,n) ((x) & ((((FbStip) 1) << (n)) - 1))
+#define FbStipMoveLsb(x,s,n) (FbStipRight (x,(s)-(n)))
+#define FbPatternOffsetBits 0
#else
-#define IcScrLeft(x,n) ((x) << (n))
-#define IcScrRight(x,n) ((x) >> (n))
-/* #define IcLeftBits(x,n) ((x) >> (FB_UNIT - (n))) */
-#define IcLeftStipBits(x,n) ((x) >> (FB_STIP_UNIT - (n)))
-#define IcStipMoveLsb(x,s,n) (x)
-#define IcPatternOffsetBits (sizeof (pixman_bits_t) - 1)
+#define FbScrLeft(x,n) ((x) << (n))
+#define FbScrRight(x,n) ((x) >> (n))
+/* #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)
#endif
-#define IcStipLeft(x,n) IcScrLeft(x,n)
-#define IcStipRight(x,n) IcScrRight(x,n)
+#define FbStipLeft(x,n) FbScrLeft(x,n)
+#define FbStipRight(x,n) FbScrRight(x,n)
-#define IcRotLeft(x,n) IcScrLeft(x,n) | (n ? IcScrRight(x,FB_UNIT-n) : 0)
-#define IcRotRight(x,n) IcScrRight(x,n) | (n ? IcScrLeft(x,FB_UNIT-n) : 0)
+#define FbRotLeft(x,n) FbScrLeft(x,n) | (n ? FbScrRight(x,FB_UNIT-n) : 0)
+#define FbRotRight(x,n) FbScrRight(x,n) | (n ? FbScrLeft(x,FB_UNIT-n) : 0)
-#define IcRotStipLeft(x,n) IcStipLeft(x,n) | (n ? IcStipRight(x,FB_STIP_UNIT-n) : 0)
-#define IcRotStipRight(x,n) IcStipRight(x,n) | (n ? IcStipLeft(x,FB_STIP_UNIT-n) : 0)
+#define FbRotStipLeft(x,n) FbStipLeft(x,n) | (n ? FbStipRight(x,FB_STIP_UNIT-n) : 0)
+#define FbRotStipRight(x,n) FbStipRight(x,n) | (n ? FbStipLeft(x,FB_STIP_UNIT-n) : 0)
-#define IcLeftMask(x) ( ((x) & FB_MASK) ? \
- IcScrRight(FB_ALLONES,(x) & FB_MASK) : 0)
-#define IcRightMask(x) ( ((FB_UNIT - (x)) & FB_MASK) ? \
- IcScrLeft(FB_ALLONES,(FB_UNIT - (x)) & FB_MASK) : 0)
+#define FbLeftMask(x) ( ((x) & FB_MASK) ? \
+ FbScrRight(FB_ALLONES,(x) & FB_MASK) : 0)
+#define FbRightMask(x) ( ((FB_UNIT - (x)) & FB_MASK) ? \
+ FbScrLeft(FB_ALLONES,(FB_UNIT - (x)) & FB_MASK) : 0)
-#define IcLeftStipMask(x) ( ((x) & FB_STIP_MASK) ? \
- IcStipRight(FB_STIP_ALLONES,(x) & FB_STIP_MASK) : 0)
-#define IcRightStipMask(x) ( ((FB_STIP_UNIT - (x)) & FB_STIP_MASK) ? \
- IcScrLeft(FB_STIP_ALLONES,(FB_STIP_UNIT - (x)) & FB_STIP_MASK) : 0)
+#define FbLeftStipMask(x) ( ((x) & FB_STIP_MASK) ? \
+ FbStipRight(FB_STIP_ALLONES,(x) & FB_STIP_MASK) : 0)
+#define FbRightStipMask(x) ( ((FB_STIP_UNIT - (x)) & FB_STIP_MASK) ? \
+ FbScrLeft(FB_STIP_ALLONES,(FB_STIP_UNIT - (x)) & FB_STIP_MASK) : 0)
-#define IcBitsMask(x,w) (IcScrRight(FB_ALLONES,(x) & FB_MASK) & \
- IcScrLeft(FB_ALLONES,(FB_UNIT - ((x) + (w))) & FB_MASK))
+#define FbBitsMask(x,w) (FbScrRight(FB_ALLONES,(x) & FB_MASK) & \
+ FbScrLeft(FB_ALLONES,(FB_UNIT - ((x) + (w))) & FB_MASK))
-#define IcStipMask(x,w) (IcStipRight(FB_STIP_ALLONES,(x) & FB_STIP_MASK) & \
- IcStipLeft(FB_STIP_ALLONES,(FB_STIP_UNIT - ((x)+(w))) & FB_STIP_MASK))
+#define FbStipMask(x,w) (FbStipRight(FB_STIP_ALLONES,(x) & FB_STIP_MASK) & \
+ FbStipLeft(FB_STIP_ALLONES,(FB_STIP_UNIT - ((x)+(w))) & FB_STIP_MASK))
-#define IcMaskBits(x,w,l,n,r) { \
+#define FbMaskBits(x,w,l,n,r) { \
n = (w); \
- r = IcRightMask((x)+n); \
- l = IcLeftMask(x); \
+ r = FbRightMask((x)+n); \
+ l = FbLeftMask(x); \
if (l) { \
n -= FB_UNIT - ((x) & FB_MASK); \
if (n < 0) { \
@@ -214,54 +214,54 @@
}
#ifdef ICNOPIXADDR
-#define IcMaskBitsBytes(x,w,copy,l,lb,n,r,rb) IcMaskBits(x,w,l,n,r)
-#define IcDoLeftMaskByteRRop(dst,lb,l,and,xor) { \
- *dst = IcDoMaskRRop(*dst,and,xor,l); \
+#define FbMaskBitsBytes(x,w,copy,l,lb,n,r,rb) FbMaskBits(x,w,l,n,r)
+#define FbDoLeftMaskByteRRop(dst,lb,l,and,xor) { \
+ *dst = FbDoMaskRRop(*dst,and,xor,l); \
}
-#define IcDoRightMaskByteRRop(dst,rb,r,and,xor) { \
- *dst = IcDoMaskRRop(*dst,and,xor,r); \
+#define FbDoRightMaskByteRRop(dst,rb,r,and,xor) { \
+ *dst = FbDoMaskRRop(*dst,and,xor,r); \
}
#else
-#define IcByteMaskInvalid 0x10
+#define FbByteMaskInvalid 0x10
-#define IcPatternOffset(o,t) ((o) ^ (IcPatternOffsetBits & ~(sizeof (t) - 1)))
+#define FbPatternOffset(o,t) ((o) ^ (FbPatternOffsetBits & ~(sizeof (t) - 1)))
-#define IcPtrOffset(p,o,t) ((t *) ((uint8_t *) (p) + (o)))
-#define IcSelectPatternPart(xor,o,t) ((xor) >> (IcPatternOffset (o,t) << 3))
-#define IcStorePart(dst,off,t,xor) (*IcPtrOffset(dst,off,t) = \
- IcSelectPart(xor,off,t))
-#ifndef IcSelectPart
-#define IcSelectPart(x,o,t) IcSelectPatternPart(x,o,t)
+#define FbPtrOffset(p,o,t) ((t *) ((uint8_t *) (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))
+#ifndef FbSelectPart
+#define FbSelectPart(x,o,t) FbSelectPatternPart(x,o,t)
#endif
-#define IcMaskBitsBytes(x,w,copy,l,lb,n,r,rb) { \
+#define FbMaskBitsBytes(x,w,copy,l,lb,n,r,rb) { \
n = (w); \
lb = 0; \
rb = 0; \
- r = IcRightMask((x)+n); \
+ r = FbRightMask((x)+n); \
if (r) { \
/* compute right byte length */ \
if ((copy) && (((x) + n) & 7) == 0) { \
rb = (((x) + n) & FB_MASK) >> 3; \
} else { \
- rb = IcByteMaskInvalid; \
+ rb = FbByteMaskInvalid; \
} \
} \
- l = IcLeftMask(x); \
+ l = FbLeftMask(x); \
if (l) { \
/* compute left byte length */ \
if ((copy) && ((x) & 7) == 0) { \
lb = ((x) & FB_MASK) >> 3; \
} else { \
- lb = IcByteMaskInvalid; \
+ lb = FbByteMaskInvalid; \
} \
/* subtract out the portion painted by leftMask */ \
n -= FB_UNIT - ((x) & FB_MASK); \
if (n < 0) { \
- if (lb != IcByteMaskInvalid) { \
- if (rb == IcByteMaskInvalid) { \
- lb = IcByteMaskInvalid; \
+ if (lb != FbByteMaskInvalid) { \
+ if (rb == FbByteMaskInvalid) { \
+ lb = FbByteMaskInvalid; \
} else if (rb) { \
lb |= (rb - lb) << (FB_SHIFT - 3); \
rb = 0; \
@@ -276,169 +276,169 @@
}
#if FB_SHIFT == 6
-#define IcDoLeftMaskByteRRop6Cases(dst,xor) \
+#define FbDoLeftMaskByteRRop6Cases(dst,xor) \
case (sizeof (pixman_bits_t) - 7) | (1 << (FB_SHIFT - 3)): \
- IcStorePart(dst,sizeof (pixman_bits_t) - 7,uint8_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 7,uint8_t,xor); \
break; \
case (sizeof (pixman_bits_t) - 7) | (2 << (FB_SHIFT - 3)): \
- IcStorePart(dst,sizeof (pixman_bits_t) - 7,uint8_t,xor); \
- IcStorePart(dst,sizeof (pixman_bits_t) - 6,uint8_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 7,uint8_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 6,uint8_t,xor); \
break; \
case (sizeof (pixman_bits_t) - 7) | (3 << (FB_SHIFT - 3)): \
- IcStorePart(dst,sizeof (pixman_bits_t) - 7,uint8_t,xor); \
- IcStorePart(dst,sizeof (pixman_bits_t) - 6,uint16_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 7,uint8_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 6,uint16_t,xor); \
break; \
case (sizeof (pixman_bits_t) - 7) | (4 << (FB_SHIFT - 3)): \
- IcStorePart(dst,sizeof (pixman_bits_t) - 7,uint8_t,xor); \
- IcStorePart(dst,sizeof (pixman_bits_t) - 6,uint16_t,xor); \
- IcStorePart(dst,sizeof (pixman_bits_t) - 4,uint8_t,xor); \
+ 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); \
break; \
case (sizeof (pixman_bits_t) - 7) | (5 << (FB_SHIFT - 3)): \
- IcStorePart(dst,sizeof (pixman_bits_t) - 7,uint8_t,xor); \
- IcStorePart(dst,sizeof (pixman_bits_t) - 6,uint16_t,xor); \
- IcStorePart(dst,sizeof (pixman_bits_t) - 4,uint16_t,xor); \
+ 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); \
break; \
case (sizeof (pixman_bits_t) - 7) | (6 << (FB_SHIFT - 3)): \
- IcStorePart(dst,sizeof (pixman_bits_t) - 7,uint8_t,xor); \
- IcStorePart(dst,sizeof (pixman_bits_t) - 6,uint16_t,xor); \
- IcStorePart(dst,sizeof (pixman_bits_t) - 4,uint16_t,xor); \
- IcStorePart(dst,sizeof (pixman_bits_t) - 2,uint8_t,xor); \
+ 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); \
break; \
case (sizeof (pixman_bits_t) - 7): \
- IcStorePart(dst,sizeof (pixman_bits_t) - 7,uint8_t,xor); \
- IcStorePart(dst,sizeof (pixman_bits_t) - 6,uint16_t,xor); \
- IcStorePart(dst,sizeof (pixman_bits_t) - 4,uint32_t,xor); \
+ 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); \
break; \
case (sizeof (pixman_bits_t) - 6) | (1 << (FB_SHIFT - 3)): \
- IcStorePart(dst,sizeof (pixman_bits_t) - 6,uint8_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 6,uint8_t,xor); \
break; \
case (sizeof (pixman_bits_t) - 6) | (2 << (FB_SHIFT - 3)): \
- IcStorePart(dst,sizeof (pixman_bits_t) - 6,uint16_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 6,uint16_t,xor); \
break; \
case (sizeof (pixman_bits_t) - 6) | (3 << (FB_SHIFT - 3)): \
- IcStorePart(dst,sizeof (pixman_bits_t) - 6,uint16_t,xor); \
- IcStorePart(dst,sizeof (pixman_bits_t) - 4,uint8_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 6,uint16_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint8_t,xor); \
break; \
case (sizeof (pixman_bits_t) - 6) | (4 << (FB_SHIFT - 3)): \
- IcStorePart(dst,sizeof (pixman_bits_t) - 6,uint16_t,xor); \
- IcStorePart(dst,sizeof (pixman_bits_t) - 4,uint16_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 6,uint16_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint16_t,xor); \
break; \
case (sizeof (pixman_bits_t) - 6) | (5 << (FB_SHIFT - 3)): \
- IcStorePart(dst,sizeof (pixman_bits_t) - 6,uint16_t,xor); \
- IcStorePart(dst,sizeof (pixman_bits_t) - 4,uint16_t,xor); \
- IcStorePart(dst,sizeof (pixman_bits_t) - 2,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); \
break; \
case (sizeof (pixman_bits_t) - 6): \
- IcStorePart(dst,sizeof (pixman_bits_t) - 6,uint16_t,xor); \
- IcStorePart(dst,sizeof (pixman_bits_t) - 4,uint32_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 6,uint16_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint32_t,xor); \
break; \
case (sizeof (pixman_bits_t) - 5) | (1 << (FB_SHIFT - 3)): \
- IcStorePart(dst,sizeof (pixman_bits_t) - 5,uint8_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 5,uint8_t,xor); \
break; \
case (sizeof (pixman_bits_t) - 5) | (2 << (FB_SHIFT - 3)): \
- IcStorePart(dst,sizeof (pixman_bits_t) - 5,uint8_t,xor); \
- IcStorePart(dst,sizeof (pixman_bits_t) - 4,uint8_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 5,uint8_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint8_t,xor); \
break; \
case (sizeof (pixman_bits_t) - 5) | (3 << (FB_SHIFT - 3)): \
- IcStorePart(dst,sizeof (pixman_bits_t) - 5,uint8_t,xor); \
- IcStorePart(dst,sizeof (pixman_bits_t) - 4,uint16_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 5,uint8_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint16_t,xor); \
break; \
case (sizeof (pixman_bits_t) - 5) | (4 << (FB_SHIFT - 3)): \
- IcStorePart(dst,sizeof (pixman_bits_t) - 5,uint8_t,xor); \
- IcStorePart(dst,sizeof (pixman_bits_t) - 4,uint16_t,xor); \
- IcStorePart(dst,sizeof (pixman_bits_t) - 2,uint8_t,xor); \
+ 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); \
break; \
case (sizeof (pixman_bits_t) - 5): \
- IcStorePart(dst,sizeof (pixman_bits_t) - 5,uint8_t,xor); \
- IcStorePart(dst,sizeof (pixman_bits_t) - 4,uint32_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 5,uint8_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint32_t,xor); \
break; \
case (sizeof (pixman_bits_t) - 4) | (1 << (FB_SHIFT - 3)): \
- IcStorePart(dst,sizeof (pixman_bits_t) - 4,uint8_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint8_t,xor); \
break; \
case (sizeof (pixman_bits_t) - 4) | (2 << (FB_SHIFT - 3)): \
- IcStorePart(dst,sizeof (pixman_bits_t) - 4,uint16_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint16_t,xor); \
break; \
case (sizeof (pixman_bits_t) - 4) | (3 << (FB_SHIFT - 3)): \
- IcStorePart(dst,sizeof (pixman_bits_t) - 4,uint16_t,xor); \
- IcStorePart(dst,sizeof (pixman_bits_t) - 2,uint8_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint16_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 2,uint8_t,xor); \
break; \
case (sizeof (pixman_bits_t) - 4): \
- IcStorePart(dst,sizeof (pixman_bits_t) - 4,uint32_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 4,uint32_t,xor); \
break;
-#define IcDoRightMaskByteRRop6Cases(dst,xor) \
+#define FbDoRightMaskByteRRop6Cases(dst,xor) \
case 4: \
- IcStorePart(dst,0,uint32_t,xor); \
+ FbStorePart(dst,0,uint32_t,xor); \
break; \
case 5: \
- IcStorePart(dst,0,uint32_t,xor); \
- IcStorePart(dst,4,uint8_t,xor); \
+ FbStorePart(dst,0,uint32_t,xor); \
+ FbStorePart(dst,4,uint8_t,xor); \
break; \
case 6: \
- IcStorePart(dst,0,uint32_t,xor); \
- IcStorePart(dst,4,uint16_t,xor); \
+ FbStorePart(dst,0,uint32_t,xor); \
+ FbStorePart(dst,4,uint16_t,xor); \
break; \
case 7: \
- IcStorePart(dst,0,uint32_t,xor); \
- IcStorePart(dst,4,uint16_t,xor); \
- IcStorePart(dst,6,uint8_t,xor); \
+ FbStorePart(dst,0,uint32_t,xor); \
+ FbStorePart(dst,4,uint16_t,xor); \
+ FbStorePart(dst,6,uint8_t,xor); \
break;
#else
-#define IcDoLeftMaskByteRRop6Cases(dst,xor)
-#define IcDoRightMaskByteRRop6Cases(dst,xor)
+#define FbDoLeftMaskByteRRop6Cases(dst,xor)
+#define FbDoRightMaskByteRRop6Cases(dst,xor)
#endif
-#define IcDoLeftMaskByteRRop(dst,lb,l,and,xor) { \
+#define FbDoLeftMaskByteRRop(dst,lb,l,and,xor) { \
switch (lb) { \
- IcDoLeftMaskByteRRop6Cases(dst,xor) \
+ FbDoLeftMaskByteRRop6Cases(dst,xor) \
case (sizeof (pixman_bits_t) - 3) | (1 << (FB_SHIFT - 3)): \
- IcStorePart(dst,sizeof (pixman_bits_t) - 3,uint8_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 3,uint8_t,xor); \
break; \
case (sizeof (pixman_bits_t) - 3) | (2 << (FB_SHIFT - 3)): \
- IcStorePart(dst,sizeof (pixman_bits_t) - 3,uint8_t,xor); \
- IcStorePart(dst,sizeof (pixman_bits_t) - 2,uint8_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 3,uint8_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 2,uint8_t,xor); \
break; \
case (sizeof (pixman_bits_t) - 2) | (1 << (FB_SHIFT - 3)): \
- IcStorePart(dst,sizeof (pixman_bits_t) - 2,uint8_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 2,uint8_t,xor); \
break; \
case sizeof (pixman_bits_t) - 3: \
- IcStorePart(dst,sizeof (pixman_bits_t) - 3,uint8_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 3,uint8_t,xor); \
case sizeof (pixman_bits_t) - 2: \
- IcStorePart(dst,sizeof (pixman_bits_t) - 2,uint16_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 2,uint16_t,xor); \
break; \
case sizeof (pixman_bits_t) - 1: \
- IcStorePart(dst,sizeof (pixman_bits_t) - 1,uint8_t,xor); \
+ FbStorePart(dst,sizeof (pixman_bits_t) - 1,uint8_t,xor); \
break; \
default: \
- *dst = IcDoMaskRRop(*dst, and, xor, l); \
+ *dst = FbDoMaskRRop(*dst, and, xor, l); \
break; \
} \
}
-#define IcDoRightMaskByteRRop(dst,rb,r,and,xor) { \
+#define FbDoRightMaskByteRRop(dst,rb,r,and,xor) { \
switch (rb) { \
case 1: \
- IcStorePart(dst,0,uint8_t,xor); \
+ FbStorePart(dst,0,uint8_t,xor); \
break; \
case 2: \
- IcStorePart(dst,0,uint16_t,xor); \
+ FbStorePart(dst,0,uint16_t,xor); \
break; \
case 3: \
- IcStorePart(dst,0,uint16_t,xor); \
- IcStorePart(dst,2,uint8_t,xor); \
+ FbStorePart(dst,0,uint16_t,xor); \
+ FbStorePart(dst,2,uint8_t,xor); \
break; \
- IcDoRightMaskByteRRop6Cases(dst,xor) \
+ FbDoRightMaskByteRRop6Cases(dst,xor) \
default: \
- *dst = IcDoMaskRRop (*dst, and, xor, r); \
+ *dst = FbDoMaskRRop (*dst, and, xor, r); \
} \
}
#endif
-#define IcMaskStip(x,w,l,n,r) { \
+#define FbMaskStip(x,w,l,n,r) { \
n = (w); \
- r = IcRightStipMask((x)+n); \
- l = IcLeftStipMask(x); \
+ r = FbRightStipMask((x)+n); \
+ l = FbLeftStipMask(x); \
if (l) { \
n -= FB_STIP_UNIT - ((x) & FB_STIP_MASK); \
if (n < 0) { \
@@ -462,72 +462,72 @@
* The term "lane" comes from the hardware term "byte-lane" which
*/
-#define IcLaneCase1(n,a,o) ((n) == 0x01 ? \
- (*(uint8_t *) ((a)+IcPatternOffset(o,uint8_t)) = \
+#define FbLaneCase1(n,a,o) ((n) == 0x01 ? \
+ (*(uint8_t *) ((a)+FbPatternOffset(o,uint8_t)) = \
fgxor) : 0)
-#define IcLaneCase2(n,a,o) ((n) == 0x03 ? \
- (*(uint16_t *) ((a)+IcPatternOffset(o,uint16_t)) = \
+#define FbLaneCase2(n,a,o) ((n) == 0x03 ? \
+ (*(uint16_t *) ((a)+FbPatternOffset(o,uint16_t)) = \
fgxor) : \
- ((void)IcLaneCase1((n)&1,a,o), \
- IcLaneCase1((n)>>1,a,(o)+1)))
-#define IcLaneCase4(n,a,o) ((n) == 0x0f ? \
- (*(uint32_t *) ((a)+IcPatternOffset(o,uint32_t)) = \
+ ((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)) = \
fgxor) : \
- ((void)IcLaneCase2((n)&3,a,o), \
- IcLaneCase2((n)>>2,a,(o)+2)))
-#define IcLaneCase8(n,a,o) ((n) == 0x0ff ? (*(pixman_bits_t *) ((a)+(o)) = fgxor) : \
- ((void)IcLaneCase4((n)&15,a,o), \
- IcLaneCase4((n)>>4,a,(o)+4)))
+ ((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) : \
+ ((void)FbLaneCase4((n)&15,a,o), \
+ FbLaneCase4((n)>>4,a,(o)+4)))
#if FB_SHIFT == 6
-#define IcLaneCase(n,a) IcLaneCase8(n,(uint8_t *) (a),0)
+#define FbLaneCase(n,a) FbLaneCase8(n,(uint8_t *) (a),0)
#endif
#if FB_SHIFT == 5
-#define IcLaneCase(n,a) IcLaneCase4(n,(uint8_t *) (a),0)
+#define FbLaneCase(n,a) FbLaneCase4(n,(uint8_t *) (a),0)
#endif
/* Rotate a filled pixel value to the specified alignement */
-#define IcRot24(p,b) (IcScrRight(p,b) | IcScrLeft(p,24-(b)))
-#define IcRot24Stip(p,b) (IcStipRight(p,b) | IcStipLeft(p,24-(b)))
+#define FbRot24(p,b) (FbScrRight(p,b) | FbScrLeft(p,24-(b)))
+#define FbRot24Stip(p,b) (FbStipRight(p,b) | FbStipLeft(p,24-(b)))
/* step a filled pixel value to the next/previous FB_UNIT alignment */
-#define IcNext24Pix(p) (IcRot24(p,(24-FB_UNIT%24)))
-#define IcPrev24Pix(p) (IcRot24(p,FB_UNIT%24))
-#define IcNext24Stip(p) (IcRot24(p,(24-FB_STIP_UNIT%24)))
-#define IcPrev24Stip(p) (IcRot24(p,FB_STIP_UNIT%24))
+#define FbNext24Pix(p) (FbRot24(p,(24-FB_UNIT%24)))
+#define FbPrev24Pix(p) (FbRot24(p,FB_UNIT%24))
+#define FbNext24Stip(p) (FbRot24(p,(24-FB_STIP_UNIT%24)))
+#define FbPrev24Stip(p) (FbRot24(p,FB_STIP_UNIT%24))
/* step a rotation value to the next/previous rotation value */
#if FB_UNIT == 64
-#define IcNext24Rot(r) ((r) == 16 ? 0 : (r) + 8)
-#define IcPrev24Rot(r) ((r) == 0 ? 16 : (r) - 8)
+#define FbNext24Rot(r) ((r) == 16 ? 0 : (r) + 8)
+#define FbPrev24Rot(r) ((r) == 0 ? 16 : (r) - 8)
#if IMAGE_BYTE_ORDER == MSBFirst
-#define IcFirst24Rot(x) (((x) + 8) % 24)
+#define FbFirst24Rot(x) (((x) + 8) % 24)
#else
-#define IcFirst24Rot(x) ((x) % 24)
+#define FbFirst24Rot(x) ((x) % 24)
#endif
#endif
#if FB_UNIT == 32
-#define IcNext24Rot(r) ((r) == 0 ? 16 : (r) - 8)
-#define IcPrev24Rot(r) ((r) == 16 ? 0 : (r) + 8)
+#define FbNext24Rot(r) ((r) == 0 ? 16 : (r) - 8)
+#define FbPrev24Rot(r) ((r) == 16 ? 0 : (r) + 8)
#if IMAGE_BYTE_ORDER == MSBFirst
-#define IcFirst24Rot(x) (((x) + 16) % 24)
+#define FbFirst24Rot(x) (((x) + 16) % 24)
#else
-#define IcFirst24Rot(x) ((x) % 24)
+#define FbFirst24Rot(x) ((x) % 24)
#endif
#endif
-#define IcNext24RotStip(r) ((r) == 0 ? 16 : (r) - 8)
-#define IcPrev24RotStip(r) ((r) == 16 ? 0 : (r) + 8)
+#define FbNext24RotStip(r) ((r) == 0 ? 16 : (r) - 8)
+#define FbPrev24RotStip(r) ((r) == 16 ? 0 : (r) + 8)
/* Whether 24-bit specific code is needed for this filled pixel value */
-#define IcCheck24Pix(p) ((p) == IcNext24Pix(p))
+#define FbCheck24Pix(p) ((p) == FbNext24Pix(p))
-#define IcGetPixels(icpixels, pointer, _stride_, _bpp_, xoff, yoff) { \
+#define FbGetPixels(icpixels, pointer, _stride_, _bpp_, xoff, yoff) { \
(pointer) = icpixels->data; \
(_stride_) = icpixels->stride / sizeof(pixman_bits_t); \
(_bpp_) = icpixels->bpp; \
@@ -535,8 +535,8 @@
(yoff) = icpixels->y; /* XXX: fb.h had this ifdef'd to constant 0. Why? */ \
}
-#define IcGetStipPixels(icpixels, pointer, _stride_, _bpp_, xoff, yoff) { \
- (pointer) = (IcStip *) icpixels->data; \
+#define FbGetStipPixels(icpixels, pointer, _stride_, _bpp_, xoff, yoff) { \
+ (pointer) = (FbStip *) icpixels->data; \
(_stride_) = icpixels->stride; \
(_bpp_) = icpixels->bpp; \
(xoff) = icpixels->x; \
@@ -549,27 +549,27 @@
(PixmapWidthPaddingInfo[d].padRoundUp+1)))
#endif
-#define IcPowerOfTwo(w) (((w) & ((w) - 1)) == 0)
+#define FbPowerOfTwo(w) (((w) & ((w) - 1)) == 0)
/*
* Accelerated tiles are power of 2 width <= FB_UNIT
*/
-#define fbEvenTile(w) ((w) <= FB_UNIT && IcPowerOfTwo(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
*/
-#define IcEvenStip(w,bpp) ((w) * (bpp) <= FB_UNIT && IcPowerOfTwo(w) && IcPowerOfTwo(bpp))
+#define FbEvenStip(w,bpp) ((w) * (bpp) <= FB_UNIT && FbPowerOfTwo(w) && FbPowerOfTwo(bpp))
/*
* icblt.c
*/
pixman_private void
fbBlt (pixman_bits_t *src,
- IcStride srcStride,
+ FbStride srcStride,
int srcX,
pixman_bits_t *dst,
- IcStride dstStride,
+ FbStride dstStride,
int dstX,
int width,
@@ -584,11 +584,11 @@
pixman_private void
fbBlt24 (pixman_bits_t *srcLine,
- IcStride srcStride,
+ FbStride srcStride,
int srcX,
pixman_bits_t *dstLine,
- IcStride dstStride,
+ FbStride dstStride,
int dstX,
int width,
@@ -601,12 +601,12 @@
int upsidedown);
pixman_private void
-fbBltStip (IcStip *src,
- IcStride srcStride, /* in IcStip units, not pixman_bits_t units */
+fbBltStip (FbStip *src,
+ FbStride srcStride, /* in FbStip units, not pixman_bits_t units */
int srcX,
- IcStip *dst,
- IcStride dstStride, /* in IcStip units, not pixman_bits_t units */
+ FbStip *dst,
+ FbStride dstStride, /* in FbStip units, not pixman_bits_t units */
int dstX,
int width,
@@ -620,11 +620,11 @@
* icbltone.c
*/
pixman_private void
-fbBltOne (IcStip *src,
- IcStride srcStride,
+fbBltOne (FbStip *src,
+ FbStride srcStride,
int srcX,
pixman_bits_t *dst,
- IcStride dstStride,
+ FbStride dstStride,
int dstX,
int dstBpp,
@@ -638,11 +638,11 @@
#ifdef FB_24BIT
pixman_private void
-fbBltOne24 (IcStip *src,
- IcStride srcStride, /* IcStip units per scanline */
+fbBltOne24 (FbStip *src,
+ FbStride srcStride, /* FbStip units per scanline */
int srcX, /* bit position of source */
pixman_bits_t *dst,
- IcStride dstStride, /* pixman_bits_t units per scanline */
+ FbStride dstStride, /* pixman_bits_t units per scanline */
int dstX, /* bit position of dest */
int dstBpp, /* bits per destination unit */
@@ -667,15 +667,15 @@
pixman_private void
fbEvenStipple (pixman_bits_t *dst,
- IcStride dstStride,
+ FbStride dstStride,
int dstX,
int dstBpp,
int width,
int height,
- IcStip *stip,
- IcStride stipStride,
+ FbStip *stip,
+ FbStride stipStride,
int stipHeight,
pixman_bits_t fgand,
@@ -688,15 +688,15 @@
pixman_private void
fbOddStipple (pixman_bits_t *dst,
- IcStride dstStride,
+ FbStride dstStride,
int dstX,
int dstBpp,
int width,
int height,
- IcStip *stip,
- IcStride stipStride,
+ FbStip *stip,
+ FbStride stipStride,
int stipWidth,
int stipHeight,
@@ -710,15 +710,15 @@
pixman_private void
fbStipple (pixman_bits_t *dst,
- IcStride dstStride,
+ FbStride dstStride,
int dstX,
int dstBpp,
int width,
int height,
- IcStip *stip,
- IcStride stipStride,
+ FbStip *stip,
+ FbStride stipStride,
int stipWidth,
int stipHeight,
int even,
@@ -741,7 +741,7 @@
int alpha, alphaMask;
};
-typedef struct _IcPixels {
+typedef struct _FbPixels {
pixman_bits_t *data;
unsigned int width;
unsigned int height;
@@ -751,7 +751,7 @@
int x;
int y;
unsigned int refcnt;
-} IcPixels;
+} FbPixels;
/* XXX: This is to avoid including colormap.h from the server includes */
typedef uint32_t Pixel;
@@ -788,14 +788,14 @@
good as the static function below. */
#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
# if __INT_MIN__ == 0x7fffffff
-# define _IcOnes(mask) __builtin_popcount(mask)
+# define _FbOnes(mask) __builtin_popcount(mask)
# else
-# define _IcOnes(mask) __builtin_popcountl((mask) & 0xffffffff)
+# define _FbOnes(mask) __builtin_popcountl((mask) & 0xffffffff)
# endif
#else
# define ICINT_NEED_FB_ONES
int
-_IcOnes(unsigned long mask);
+_FbOnes(unsigned long mask);
#endif
/* icformat.c */
@@ -806,19 +806,19 @@
/* icimage.c */
pixman_private pixman_image_t *
-pixman_image_createForPixels (IcPixels *pixels,
+pixman_image_createForPixels (FbPixels *pixels,
pixman_format_t *format);
/* icpixels.c */
-pixman_private IcPixels *
-IcPixelsCreate (int width, int height, int depth);
+pixman_private FbPixels *
+FbPixelsCreate (int width, int height, int depth);
-pixman_private IcPixels *
-IcPixelsCreateForData (pixman_bits_t *data, int width, int height, int depth, int bpp, int stride);
+pixman_private FbPixels *
+FbPixelsCreateForData (pixman_bits_t *data, int width, int height, int depth, int bpp, int stride);
pixman_private void
-IcPixelsDestroy (IcPixels *pixels);
+FbPixelsDestroy (FbPixels *pixels);
/* ictransform.c */
Index: icpixels.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/icpixels.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- icpixels.c 25 Jun 2005 01:21:16 -0000 1.8
+++ icpixels.c 25 Jun 2005 03:13:19 -0000 1.9
@@ -25,7 +25,7 @@
#include "pixman-xserver-compat.h"
static void
-IcPixelsInit (IcPixels *pixels, pixman_bits_t *buf, int width, int height, int depth, int bpp, int stride);
+FbPixelsInit (FbPixels *pixels, pixman_bits_t *buf, int width, int height, int depth, int bpp, int stride);
static unsigned int
pixman_bits_per_pixel (unsigned int depth);
@@ -47,10 +47,10 @@
return 1;
}
-IcPixels *
-IcPixelsCreate (int width, int height, int depth)
+FbPixels *
+FbPixelsCreate (int width, int height, int depth)
{
- IcPixels *pixels;
+ FbPixels *pixels;
pixman_bits_t *buf;
unsigned int buf_size;
unsigned int bpp;
@@ -61,7 +61,7 @@
bpp = pixman_bits_per_pixel (depth);
stride = ((width * bpp + FB_MASK) >> FB_SHIFT) * sizeof (pixman_bits_t);
buf_size = height * stride;
- base = sizeof (IcPixels);
+ base = sizeof (FbPixels);
adjust = 0;
if (base & 7)
adjust = 8 - (base & 7);
@@ -73,27 +73,27 @@
buf = (pixman_bits_t *) ((char *)pixels + base + adjust);
- IcPixelsInit (pixels, buf, width, height, depth, bpp, stride);
+ FbPixelsInit (pixels, buf, width, height, depth, bpp, stride);
return pixels;
}
-IcPixels *
-IcPixelsCreateForData (pixman_bits_t *data, int width, int height, int depth, int bpp, int stride)
+FbPixels *
+FbPixelsCreateForData (pixman_bits_t *data, int width, int height, int depth, int bpp, int stride)
{
- IcPixels *pixels;
+ FbPixels *pixels;
- pixels = malloc (sizeof (IcPixels));
+ pixels = malloc (sizeof (FbPixels));
if (pixels == NULL)
return NULL;
- IcPixelsInit (pixels, data, width, height, depth, bpp, stride);
+ FbPixelsInit (pixels, data, width, height, depth, bpp, stride);
return pixels;
}
static void
-IcPixelsInit (IcPixels *pixels, pixman_bits_t *buf, int width, int height, int depth, int bpp, int stride)
+FbPixelsInit (FbPixels *pixels, pixman_bits_t *buf, int width, int height, int depth, int bpp, int stride)
{
pixels->data = buf;
pixels->width = width;
@@ -107,7 +107,7 @@
}
void
-IcPixelsDestroy (IcPixels *pixels)
+FbPixelsDestroy (FbPixels *pixels)
{
if(--pixels->refcnt)
return;
Index: icrect.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/icrect.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- icrect.c 28 Apr 2005 18:16:52 -0000 1.14
+++ icrect.c 25 Jun 2005 03:13:19 -0000 1.15
@@ -247,13 +247,13 @@
else
{
pixman_format_t rgbaFormat;
- IcPixels *pixels;
+ FbPixels *pixels;
pixman_image_t *src;
pixman_bits_t pixel;
pixman_format_init (&rgbaFormat, PICT_a8r8g8b8);
- pixels = IcPixelsCreate (1, 1, rgbaFormat.depth);
+ pixels = FbPixelsCreate (1, 1, rgbaFormat.depth);
if (!pixels)
goto bail1;
@@ -286,7 +286,7 @@
pixman_image_destroy (src);
bail2:
- IcPixelsDestroy (pixels);
+ FbPixelsDestroy (pixels);
bail1:
;
}
Index: icrop.h
===================================================================
RCS file: /cvs/cairo/libpixman/src/icrop.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- icrop.h 25 Jun 2005 01:28:19 -0000 1.11
+++ icrop.h 25 Jun 2005 03:13:19 -0000 1.12
@@ -27,50 +27,50 @@
typedef struct _mergeRopBits {
pixman_bits_t ca1, cx1, ca2, cx2;
-} IcMergeRopRec, *IcMergeRopPtr;
+} FbMergeRopRec, *FbMergeRopPtr;
-extern const IcMergeRopRec IcMergeRopBits[16] pixman_private;
+extern const FbMergeRopRec FbMergeRopBits[16] pixman_private;
-#define IcDeclareMergeRop() pixman_bits_t _ca1, _cx1, _ca2, _cx2;
-#define IcDeclarePrebuiltMergeRop() pixman_bits_t _cca, _ccx;
+#define FbDeclareMergeRop() pixman_bits_t _ca1, _cx1, _ca2, _cx2;
+#define FbDeclarePrebuiltMergeRop() pixman_bits_t _cca, _ccx;
-#define IcInitializeMergeRop(alu,pm) {\
- const IcMergeRopRec *_bits; \
- _bits = &IcMergeRopBits[alu]; \
+#define FbInitializeMergeRop(alu,pm) {\
+ const FbMergeRopRec *_bits; \
+ _bits = &FbMergeRopBits[alu]; \
_ca1 = _bits->ca1 & pm; \
_cx1 = _bits->cx1 | ~pm; \
_ca2 = _bits->ca2 & pm; \
_cx2 = _bits->cx2 & pm; \
}
-#define IcDestInvarientRop(alu,pm) ((pm) == FB_ALLONES && \
+#define FbDestInvarientRop(alu,pm) ((pm) == FB_ALLONES && \
(((alu) >> 1 & 5) == ((alu) & 5)))
-#define IcDestInvarientMergeRop() (_ca1 == 0 && _cx1 == 0)
+#define FbDestInvarientMergeRop() (_ca1 == 0 && _cx1 == 0)
/* AND has higher precedence than XOR */
-#define IcDoMergeRop(src, dst) \
+#define FbDoMergeRop(src, dst) \
(((dst) & (((src) & _ca1) ^ _cx1)) ^ (((src) & _ca2) ^ _cx2))
-#define IcDoDestInvarientMergeRop(src) (((src) & _ca2) ^ _cx2)
+#define FbDoDestInvarientMergeRop(src) (((src) & _ca2) ^ _cx2)
-#define IcDoMaskMergeRop(src, dst, mask) \
+#define FbDoMaskMergeRop(src, dst, mask) \
(((dst) & ((((src) & _ca1) ^ _cx1) | ~(mask))) ^ ((((src) & _ca2) ^ _cx2) & (mask)))
-#define IcDoLeftMaskByteMergeRop(dst, src, lb, l) { \
+#define FbDoLeftMaskByteMergeRop(dst, src, lb, l) { \
pixman_bits_t __xor = ((src) & _ca2) ^ _cx2; \
- IcDoLeftMaskByteRRop(dst,lb,l,((src) & _ca1) ^ _cx1,__xor); \
+ FbDoLeftMaskByteRRop(dst,lb,l,((src) & _ca1) ^ _cx1,__xor); \
}
-#define IcDoRightMaskByteMergeRop(dst, src, rb, r) { \
+#define FbDoRightMaskByteMergeRop(dst, src, rb, r) { \
pixman_bits_t __xor = ((src) & _ca2) ^ _cx2; \
- IcDoRightMaskByteRRop(dst,rb,r,((src) & _ca1) ^ _cx1,__xor); \
+ FbDoRightMaskByteRRop(dst,rb,r,((src) & _ca1) ^ _cx1,__xor); \
}
-#define IcDoRRop(dst, and, xor) (((dst) & (and)) ^ (xor))
+#define FbDoRRop(dst, and, xor) (((dst) & (and)) ^ (xor))
-#define IcDoMaskRRop(dst, and, xor, mask) \
+#define FbDoMaskRRop(dst, and, xor, mask) \
(((dst) & ((and) | ~(mask))) ^ (xor & mask))
/*
@@ -89,9 +89,9 @@
#define fbAnd(rop,fg,pm) fbAndT(rop,fg,pm,pixman_bits_t)
-#define fbXorStip(rop,fg,pm) fbXorT(rop,fg,pm,IcStip)
+#define fbXorStip(rop,fg,pm) fbXorT(rop,fg,pm,FbStip)
-#define fbAndStip(rop,fg,pm) fbAndT(rop,fg,pm,IcStip)
+#define fbAndStip(rop,fg,pm) fbAndT(rop,fg,pm,FbStip)
/*
* Stippling operations;
@@ -105,33 +105,33 @@
pixman_private const pixman_bits_t *
fbStippleTable(int bits);
-#define IcStippleRRop(dst, b, fa, fx, ba, bx) \
- (IcDoRRop(dst, fa, fx) & b) | (IcDoRRop(dst, ba, bx) & ~b)
+#define FbStippleRRop(dst, b, fa, fx, ba, bx) \
+ (FbDoRRop(dst, fa, fx) & b) | (FbDoRRop(dst, ba, bx) & ~b)
-#define IcStippleRRopMask(dst, b, fa, fx, ba, bx, m) \
- (IcDoMaskRRop(dst, fa, fx, m) & (b)) | (IcDoMaskRRop(dst, ba, bx, m) & ~(b))
+#define FbStippleRRopMask(dst, b, fa, fx, ba, bx, m) \
+ (FbDoMaskRRop(dst, fa, fx, m) & (b)) | (FbDoMaskRRop(dst, ba, bx, m) & ~(b))
-#define IcDoLeftMaskByteStippleRRop(dst, b, fa, fx, ba, bx, lb, l) { \
+#define FbDoLeftMaskByteStippleRRop(dst, b, fa, fx, ba, bx, lb, l) { \
pixman_bits_t __xor = ((fx) & (b)) | ((bx) & ~(b)); \
- IcDoLeftMaskByteRRop(dst, lb, l, ((fa) & (b)) | ((ba) & ~(b)), __xor); \
+ FbDoLeftMaskByteRRop(dst, lb, l, ((fa) & (b)) | ((ba) & ~(b)), __xor); \
}
-#define IcDoRightMaskByteStippleRRop(dst, b, fa, fx, ba, bx, rb, r) { \
+#define FbDoRightMaskByteStippleRRop(dst, b, fa, fx, ba, bx, rb, r) { \
pixman_bits_t __xor = ((fx) & (b)) | ((bx) & ~(b)); \
- IcDoRightMaskByteRRop(dst, rb, r, ((fa) & (b)) | ((ba) & ~(b)), __xor); \
+ FbDoRightMaskByteRRop(dst, rb, r, ((fa) & (b)) | ((ba) & ~(b)), __xor); \
}
-#define IcOpaqueStipple(b, fg, bg) (((fg) & (b)) | ((bg) & ~(b)))
+#define FbOpaqueStipple(b, fg, bg) (((fg) & (b)) | ((bg) & ~(b)))
/*
* Compute rop for using tile code for 1-bit dest stipples; modifies
* existing rop to flip depending on pixel values
*/
-#define IcStipple1RopPick(alu,b) (((alu) >> (2 - (((b) & 1) << 1))) & 3)
+#define FbStipple1RopPick(alu,b) (((alu) >> (2 - (((b) & 1) << 1))) & 3)
-#define IcOpaqueStipple1Rop(alu,fg,bg) (IcStipple1RopPick(alu,fg) | \
- (IcStipple1RopPick(alu,bg) << 2))
+#define FbOpaqueStipple1Rop(alu,fg,bg) (FbStipple1RopPick(alu,fg) | \
+ (FbStipple1RopPick(alu,bg) << 2))
-#define IcStipple1Rop(alu,fg) (IcStipple1RopPick(alu,fg) | 4)
+#define FbStipple1Rop(alu,fg) (FbStipple1RopPick(alu,fg) | 4)
#endif
Index: icstipple.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/icstipple.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- icstipple.c 25 Jun 2005 01:28:19 -0000 1.8
+++ icstipple.c 25 Jun 2005 03:13:19 -0000 1.9
@@ -31,7 +31,7 @@
* transparent stipple
*/
#define LaneCases1(c,a) case c: \
- while (n--) { (void)IcLaneCase(c,a); a++; } \
+ while (n--) { (void)FbLaneCase(c,a); a++; } \
break
#define LaneCases2(c,a) LaneCases1(c,a); LaneCases1(c+1,a)
#define LaneCases4(c,a) LaneCases2(c,a); LaneCases2(c+2,a)
@@ -60,17 +60,17 @@
FbBits fgxor,
int n)
{
- IcStip s;
+ FbStip s;
- s = ((IcStip) (stip ) & 0x01);
- s |= ((IcStip) (stip >> 8) & 0x02);
- s |= ((IcStip) (stip >> 16) & 0x04);
- s |= ((IcStip) (stip >> 24) & 0x08);
+ s = ((FbStip) (stip ) & 0x01);
+ s |= ((FbStip) (stip >> 8) & 0x02);
+ s |= ((FbStip) (stip >> 16) & 0x04);
+ s |= ((FbStip) (stip >> 24) & 0x08);
#if FB_SHIFT > 5
- s |= ((IcStip) (stip >> 32) & 0x10);
- s |= ((IcStip) (stip >> 40) & 0x20);
- s |= ((IcStip) (stip >> 48) & 0x40);
- s |= ((IcStip) (stip >> 56) & 0x80);
+ s |= ((FbStip) (stip >> 32) & 0x10);
+ s |= ((FbStip) (stip >> 40) & 0x20);
+ s |= ((FbStip) (stip >> 48) & 0x40);
+ s |= ((FbStip) (stip >> 56) & 0x80);
#endif
switch (s) {
LaneCases(dst);
Index: ictrap.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/ictrap.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- ictrap.c 13 May 2005 03:25:07 -0000 1.25
+++ ictrap.c 25 Jun 2005 03:13:19 -0000 1.26
@@ -25,7 +25,7 @@
#include "icint.h"
pixman_image_t *
-IcCreateAlphaPicture (pixman_image_t *dst,
+FbCreateAlphaPicture (pixman_image_t *dst,
pixman_format_t *format,
uint16_t width,
uint16_t height)
@@ -167,7 +167,7 @@
if (!format)
return;
- image = IcCreateAlphaPicture (dst, format,
+ image = FbCreateAlphaPicture (dst, format,
bounds.x2 - bounds.x1,
bounds.y2 - bounds.y1);
if (!image)
Index: ictri.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/ictri.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ictri.c 2 Mar 2005 15:43:33 -0000 1.13
+++ ictri.c 25 Jun 2005 03:13:19 -0000 1.14
@@ -57,7 +57,7 @@
}
static void
-IcRasterizeTriangle (pixman_image_t *image,
+FbRasterizeTriangle (pixman_image_t *image,
const pixman_triangle_t *tri,
int x_off,
int y_off)
@@ -159,7 +159,7 @@
pixman_triangle_bounds (ntris, tris, &bounds);
if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)
return;
- image = IcCreateAlphaPicture (dst,
+ image = FbCreateAlphaPicture (dst,
format,
bounds.x2 - bounds.x1,
bounds.y2 - bounds.y1);
@@ -173,14 +173,14 @@
pixman_triangle_bounds (1, tris, &bounds);
if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)
continue;
- image = IcCreateAlphaPicture (dst,
+ image = FbCreateAlphaPicture (dst,
format,
bounds.x2 - bounds.x1,
bounds.y2 - bounds.y1);
if (!image)
break;
}
- IcRasterizeTriangle (image, tris, -bounds.x1, -bounds.y1);
+ FbRasterizeTriangle (image, tris, -bounds.x1, -bounds.y1);
if (!format)
{
xRel = bounds.x1 + xSrc - xDst;
@@ -233,7 +233,7 @@
pixman_point_fixed_bounds (npoints, points, &bounds);
if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)
return;
- image = IcCreateAlphaPicture (dst,
+ image = FbCreateAlphaPicture (dst,
format,
bounds.x2 - bounds.x1,
bounds.y2 - bounds.y1);
@@ -250,14 +250,14 @@
pixman_triangle_bounds (1, &tri, &bounds);
if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)
continue;
- image = IcCreateAlphaPicture (dst,
+ image = FbCreateAlphaPicture (dst,
format,
bounds.x2 - bounds.x1,
bounds.y2 - bounds.y1);
if (!image)
continue;
}
- IcRasterizeTriangle (image, &tri, -bounds.x1, -bounds.y1);
+ FbRasterizeTriangle (image, &tri, -bounds.x1, -bounds.y1);
if (!format)
{
xRel = bounds.x1 + xSrc - xDst;
@@ -310,7 +310,7 @@
pixman_point_fixed_bounds (npoints, points, &bounds);
if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)
return;
- image = IcCreateAlphaPicture (dst,
+ image = FbCreateAlphaPicture (dst,
format,
bounds.x2 - bounds.x1,
bounds.y2 - bounds.y1);
@@ -329,14 +329,14 @@
pixman_triangle_bounds (1, &tri, &bounds);
if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)
continue;
- image = IcCreateAlphaPicture (dst,
+ image = FbCreateAlphaPicture (dst,
format,
bounds.x2 - bounds.x1,
bounds.y2 - bounds.y1);
if (!image)
continue;
}
- IcRasterizeTriangle (image, &tri, -bounds.x1, -bounds.y1);
+ FbRasterizeTriangle (image, &tri, -bounds.x1, -bounds.y1);
if (!format)
{
xRel = bounds.x1 + xSrc - xDst;
Index: icutil.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/icutil.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- icutil.c 25 Jun 2005 01:28:19 -0000 1.10
+++ icutil.c 25 Jun 2005 03:13:19 -0000 1.11
@@ -29,7 +29,7 @@
{
pixman_bits_t b = p;
- b &= IcFullMask (bpp);
+ b &= FbFullMask (bpp);
while (bpp < FB_UNIT)
{
b |= b << bpp;
@@ -41,7 +41,7 @@
#define O 0
#define I FB_ALLONES
-const IcMergeRopRec IcMergeRopBits[16] = {
+const FbMergeRopRec FbMergeRopBits[16] = {
{ O,O,O,O }, /* clear 0x0 0 */
{ I,O,O,O }, /* and 0x1 src AND dst */
{ I,O,I,O }, /* andReverse 0x2 src AND NOT dst */
Index: pixman-xserver-compat.h
===================================================================
RCS file: /cvs/cairo/libpixman/src/pixman-xserver-compat.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pixman-xserver-compat.h 25 Jun 2005 01:21:16 -0000 1.4
+++ pixman-xserver-compat.h 25 Jun 2005 03:13:19 -0000 1.5
@@ -73,7 +73,7 @@
#define FB_MASK IC_MASK
#define FB_ALLONES IC_ALLONES
*/
-#define FbMaskBits IcMaskBits
+//#define FbMaskBits IcMaskBits
/* XXX: We changed some function and field names which makes for some
* ugly hacks... */
More information about the cairo-commit
mailing list