summaryrefslogtreecommitdiff
path: root/pixman
diff options
context:
space:
mode:
authorJeff Muizelaar <jeff@infidigm.net>2005-06-24 18:28:19 +0000
committerJeff Muizelaar <jeff@infidigm.net>2005-06-24 18:28:19 +0000
commit42fc090745c8d262b8348b9f7a6c204e9a9b2379 (patch)
tree950a3ccadda327c136d61b59a65b7c71fa041293 /pixman
parent43e3e7eeff6ff0f9fc0b161f70dfa0f5071a087e (diff)
selective s/Ic/fb/g.
I took out the list of functions because it was ridiculously long.
Diffstat (limited to 'pixman')
-rw-r--r--pixman/ChangeLog16
-rw-r--r--pixman/src/ic.c96
-rw-r--r--pixman/src/icblt.c34
-rw-r--r--pixman/src/icbltone.c96
-rw-r--r--pixman/src/iccompose.c466
-rw-r--r--pixman/src/icimage.h2
-rw-r--r--pixman/src/icint.h30
-rw-r--r--pixman/src/icrop.h26
-rw-r--r--pixman/src/icstipple.c2
-rw-r--r--pixman/src/icutil.c42
10 files changed, 413 insertions, 397 deletions
diff --git a/pixman/ChangeLog b/pixman/ChangeLog
index 49e1c688..1e69c7ab 100644
--- a/pixman/ChangeLog
+++ b/pixman/ChangeLog
@@ -1,3 +1,19 @@
+2005-06-24 Jeff Muizelaar <jeff@infidigm.net>
+
+ * src/ic.c:
+ * src/icblt.c:
+ * src/icbltone.c:
+ * src/iccompose.c:
+ * src/icimage.h:
+ * src/icint.h:
+ * src/icrop.h:
+ * src/icstipple.c:
+ * src/icutil.c:
+
+ selective s/Ic/fb/g.
+
+ I took out the list of functions because it was ridiculously long.
+
2005-06-24 Jeff Muizelaar <jeff@infidigm.net>
* src/ic.c: (pixman_compositeSrcAdd_1000x1000),
diff --git a/pixman/src/ic.c b/pixman/src/ic.c
index c55da1c9..7ccb3539 100644
--- a/pixman/src/ic.c
+++ b/pixman/src/ic.c
@@ -51,7 +51,7 @@
#endif
static uint32_t
-IcOver (uint32_t x, uint32_t y)
+fbOver (uint32_t x, uint32_t y)
{
uint16_t a = ~x >> 24;
uint16_t t;
@@ -65,7 +65,7 @@ IcOver (uint32_t x, uint32_t y)
}
static uint32_t
-IcOver24 (uint32_t x, uint32_t y)
+fbOver24 (uint32_t x, uint32_t y)
{
uint16_t a = ~x >> 24;
uint16_t t;
@@ -78,7 +78,7 @@ IcOver24 (uint32_t x, uint32_t y)
}
static uint32_t
-IcIn (uint32_t x, uint8_t y)
+fbIn (uint32_t x, uint8_t y)
{
uint16_t a = y;
uint16_t t;
@@ -91,7 +91,7 @@ IcIn (uint32_t x, uint8_t y)
return m|n|o|p;
}
-#define IcComposeGetSolid(image, bits) { \
+#define fbComposeGetSolid(image, bits) { \
FbBits *__bits__; \
IcStride __stride__; \
int __bpp__; \
@@ -117,7 +117,7 @@ IcIn (uint32_t x, uint8_t y)
(bits) |= 0xff000000; \
}
-#define IcComposeGetStart(image,x,y,type,stride,line,mul) {\
+#define fbComposeGetStart(image,x,y,type,stride,line,mul) {\
FbBits *__bits__; \
IcStride __stride__; \
int __bpp__; \
@@ -154,15 +154,15 @@ pixman_compositeSolidMask_nx8x8888 (pixman_operator_t op,
IcStride dstStride, maskStride;
uint16_t w;
- IcComposeGetSolid(iSrc, src);
+ fbComposeGetSolid(iSrc, src);
dstMask = IcFullMask (iDst->pixels->depth);
srca = src >> 24;
if (src == 0)
return;
- IcComposeGetStart (iDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
- IcComposeGetStart (iMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
+ fbComposeGetStart (iDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
+ fbComposeGetStart (iMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
while (height--)
{
@@ -180,12 +180,12 @@ pixman_compositeSolidMask_nx8x8888 (pixman_operator_t op,
if (srca == 0xff)
*dst = src & dstMask;
else
- *dst = IcOver (src, *dst) & dstMask;
+ *dst = fbOver (src, *dst) & dstMask;
}
else if (m)
{
- d = IcIn (src, m);
- *dst = IcOver (d, *dst) & dstMask;
+ d = fbIn (src, m);
+ *dst = fbOver (d, *dst) & dstMask;
}
dst++;
}
@@ -213,15 +213,15 @@ pixman_compositeSolidMask_nx8888x8888C (pixman_operator_t op,
uint16_t w;
uint32_t m, n, o, p;
- IcComposeGetSolid(iSrc, src);
+ fbComposeGetSolid(iSrc, src);
dstMask = IcFullMask (iDst->pixels->depth);
srca = src >> 24;
if (src == 0)
return;
- IcComposeGetStart (iDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
- IcComposeGetStart (iMask, xMask, yMask, uint32_t, maskStride, maskLine, 1);
+ fbComposeGetStart (iDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
+ fbComposeGetStart (iMask, xMask, yMask, uint32_t, maskStride, maskLine, 1);
while (height--)
{
@@ -239,7 +239,7 @@ pixman_compositeSolidMask_nx8888x8888C (pixman_operator_t op,
if (srca == 0xff)
*dst = src & dstMask;
else
- *dst = IcOver (src, *dst) & dstMask;
+ *dst = fbOver (src, *dst) & dstMask;
}
else if (ma)
{
@@ -286,14 +286,14 @@ pixman_compositeSolidMask_nx8x0888 (pixman_operator_t op,
IcStride dstStride, maskStride;
uint16_t w;
- IcComposeGetSolid(iSrc, src);
+ fbComposeGetSolid(iSrc, src);
srca = src >> 24;
if (src == 0)
return;
- IcComposeGetStart (iDst, xDst, yDst, uint8_t, dstStride, dstLine, 3);
- IcComposeGetStart (iMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
+ fbComposeGetStart (iDst, xDst, yDst, uint8_t, dstStride, dstLine, 3);
+ fbComposeGetStart (iMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
while (height--)
{
@@ -313,13 +313,13 @@ pixman_compositeSolidMask_nx8x0888 (pixman_operator_t op,
else
{
d = Fetch24(dst);
- d = IcOver24 (src, d);
+ d = fbOver24 (src, d);
}
Store24(dst,d);
}
else if (m)
{
- d = IcOver24 (IcIn(src,m), Fetch24(dst));
+ d = fbOver24 (fbIn(src,m), Fetch24(dst));
Store24(dst,d);
}
dst += 3;
@@ -348,14 +348,14 @@ pixman_compositeSolidMask_nx8x0565 (pixman_operator_t op,
IcStride dstStride, maskStride;
uint16_t w;
- IcComposeGetSolid(iSrc, src);
+ fbComposeGetSolid(iSrc, src);
srca = src >> 24;
if (src == 0)
return;
- IcComposeGetStart (iDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
- IcComposeGetStart (iMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
+ fbComposeGetStart (iDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
+ fbComposeGetStart (iMask, xMask, yMask, uint8_t, maskStride, maskLine, 1);
while (height--)
{
@@ -375,14 +375,14 @@ pixman_compositeSolidMask_nx8x0565 (pixman_operator_t op,
else
{
d = *dst;
- d = IcOver24 (src, cvt0565to8888(d));
+ d = fbOver24 (src, cvt0565to8888(d));
}
*dst = cvt8888to0565(d);
}
else if (m)
{
d = *dst;
- d = IcOver24 (IcIn(src,m), cvt0565to8888(d));
+ d = fbOver24 (fbIn(src,m), cvt0565to8888(d));
*dst = cvt8888to0565(d);
}
dst++;
@@ -413,7 +413,7 @@ pixman_compositeSolidMask_nx8888x0565C (pixman_operator_t op,
uint16_t w;
uint32_t m, n, o;
- IcComposeGetSolid(iSrc, src);
+ fbComposeGetSolid(iSrc, src);
srca = src >> 24;
if (src == 0)
@@ -421,8 +421,8 @@ pixman_compositeSolidMask_nx8888x0565C (pixman_operator_t op,
src16 = cvt8888to0565(src);
- IcComposeGetStart (iDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
- IcComposeGetStart (iMask, xMask, yMask, uint32_t, maskStride, maskLine, 1);
+ fbComposeGetStart (iDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
+ fbComposeGetStart (iMask, xMask, yMask, uint32_t, maskStride, maskLine, 1);
while (height--)
{
@@ -444,7 +444,7 @@ pixman_compositeSolidMask_nx8888x0565C (pixman_operator_t op,
else
{
d = *dst;
- d = IcOver24 (src, cvt0565to8888(d));
+ d = fbOver24 (src, cvt0565to8888(d));
*dst = cvt8888to0565(d);
}
}
@@ -483,8 +483,8 @@ pixman_compositeSrc_8888x8888 (pixman_operator_t op,
uint8_t a;
uint16_t w;
- IcComposeGetStart (iDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
- IcComposeGetStart (iSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
+ fbComposeGetStart (iDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
+ fbComposeGetStart (iSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
dstMask = IcFullMask (iDst->pixels->depth);
@@ -503,7 +503,7 @@ pixman_compositeSrc_8888x8888 (pixman_operator_t op,
if (a == 0xff)
*dst = s & dstMask;
else if (a)
- *dst = IcOver (s, *dst) & dstMask;
+ *dst = fbOver (s, *dst) & dstMask;
dst++;
}
}
@@ -530,8 +530,8 @@ pixman_compositeSrc_8888x0888 (pixman_operator_t op,
IcStride dstStride, srcStride;
uint16_t w;
- IcComposeGetStart (iDst, xDst, yDst, uint8_t, dstStride, dstLine, 3);
- IcComposeGetStart (iSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
+ fbComposeGetStart (iDst, xDst, yDst, uint8_t, dstStride, dstLine, 3);
+ fbComposeGetStart (iSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
while (height--)
{
@@ -550,7 +550,7 @@ pixman_compositeSrc_8888x0888 (pixman_operator_t op,
if (a == 0xff)
d = s;
else
- d = IcOver24 (s, Fetch24(dst));
+ d = fbOver24 (s, Fetch24(dst));
Store24(dst,d);
}
dst += 3;
@@ -579,8 +579,8 @@ pixman_compositeSrc_8888x0565 (pixman_operator_t op,
IcStride dstStride, srcStride;
uint16_t w;
- IcComposeGetStart (iSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
- IcComposeGetStart (iDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
+ fbComposeGetStart (iSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
+ fbComposeGetStart (iDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
while (height--)
{
@@ -601,7 +601,7 @@ pixman_compositeSrc_8888x0565 (pixman_operator_t op,
else
{
d = *dst;
- d = IcOver24 (s, cvt0565to8888(d));
+ d = fbOver24 (s, cvt0565to8888(d));
}
*dst = cvt8888to0565(d);
}
@@ -629,9 +629,9 @@ pixman_compositeSrc_0565x0565 (pixman_operator_t op,
IcStride dstStride, srcStride;
uint16_t w;
- IcComposeGetStart (iSrc, xSrc, ySrc, uint16_t, srcStride, srcLine, 1);
+ fbComposeGetStart (iSrc, xSrc, ySrc, uint16_t, srcStride, srcLine, 1);
- IcComposeGetStart (iDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
+ fbComposeGetStart (iDst, xDst, yDst, uint16_t, dstStride, dstLine, 1);
while (height--)
{
@@ -667,8 +667,8 @@ pixman_compositeSrcAdd_8000x8000 (pixman_operator_t op,
uint8_t s, d;
uint16_t t;
- IcComposeGetStart (iSrc, xSrc, ySrc, uint8_t, srcStride, srcLine, 1);
- IcComposeGetStart (iDst, xDst, yDst, uint8_t, dstStride, dstLine, 1);
+ fbComposeGetStart (iSrc, xSrc, ySrc, uint8_t, srcStride, srcLine, 1);
+ fbComposeGetStart (iDst, xDst, yDst, uint8_t, dstStride, dstLine, 1);
while (height--)
{
@@ -718,8 +718,8 @@ pixman_compositeSrcAdd_8888x8888 (pixman_operator_t op,
uint16_t t;
uint32_t m,n,o,p;
- IcComposeGetStart (iSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
- IcComposeGetStart (iDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
+ fbComposeGetStart (iSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
+ fbComposeGetStart (iDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
while (height--)
{
@@ -777,7 +777,7 @@ pixman_compositeSrcAdd_1000x1000 (pixman_operator_t op,
IcGetPixels(iDst->pixels, dstBits, dstStride, dstBpp, dstXoff, dstYoff);
- IcBlt (srcBits + srcStride * (ySrc + srcYoff),
+ fbBlt (srcBits + srcStride * (ySrc + srcYoff),
srcStride,
xSrc + srcXoff,
@@ -818,7 +818,7 @@ pixman_compositeSolidMask_nx1xn (pixman_operator_t op,
int maskXoff, maskYoff;
FbBits src;
- IcComposeGetSolid(iSrc, src);
+ fbComposeGetSolid(iSrc, src);
if ((src & 0xff000000) != 0xff000000)
{
@@ -840,9 +840,9 @@ pixman_compositeSolidMask_nx1xn (pixman_operator_t op,
break;
}
- src = IcReplicatePixel (src, dstBpp);
+ src = fbReplicatePixel (src, dstBpp);
- IcBltOne (maskBits + maskStride * (yMask + maskYoff),
+ fbBltOne (maskBits + maskStride * (yMask + maskYoff),
maskStride,
xMask + maskXoff,
diff --git a/pixman/src/icblt.c b/pixman/src/icblt.c
index f34abb94..2fc53635 100644
--- a/pixman/src/icblt.c
+++ b/pixman/src/icblt.c
@@ -37,7 +37,7 @@
}
void
-IcBlt (FbBits *srcLine,
+fbBlt (FbBits *srcLine,
IcStride srcStride,
int srcX,
@@ -91,7 +91,7 @@ IcBlt (FbBits *srcLine,
#ifdef FB_24BIT
if (bpp == 24 && !IcCheck24Pix (pm))
{
- IcBlt24 (srcLine, srcStride, srcX, dstLine, dstStride, dstX,
+ fbBlt24 (srcLine, srcStride, srcX, dstLine, dstStride, dstX,
width, height, alu, pm, reverse, upsidedown);
return;
}
@@ -173,7 +173,7 @@ IcBlt (FbBits *srcLine,
#if 0
/*
* This provides some speedup on screen->screen blts
- * over the PCI bus, usually about 10%. But Ic
+ * over the PCI bus, usually about 10%. But fb
* isn't usually used for this operation...
*/
if (_ca2 + 1 == 0 && _cx2 == 0)
@@ -350,7 +350,7 @@ getPixel (char *src, int x)
#endif
static void
-IcBlt24Line (FbBits *src,
+fbBlt24Line (FbBits *src,
int srcX,
FbBits *dst,
@@ -564,7 +564,7 @@ IcBlt24Line (FbBits *src,
}
void
-IcBlt24 (FbBits *srcLine,
+fbBlt24 (FbBits *srcLine,
IcStride srcStride,
int srcX,
@@ -590,7 +590,7 @@ IcBlt24 (FbBits *srcLine,
}
while (height--)
{
- IcBlt24Line (srcLine, srcX, dstLine, dstX, width, alu, pm, reverse);
+ fbBlt24Line (srcLine, srcX, dstLine, dstX, width, alu, pm, reverse);
srcLine += srcStride;
dstLine += dstStride;
}
@@ -608,7 +608,7 @@ IcBlt24 (FbBits *srcLine,
*/
void
-IcBltOdd (FbBits *srcLine,
+fbBltOdd (FbBits *srcLine,
IcStride srcStrideEven,
IcStride srcStrideOdd,
int srcXEven,
@@ -781,7 +781,7 @@ IcBltOdd (FbBits *srcLine,
#ifdef FB_24BIT
void
-IcBltOdd24 (FbBits *srcLine,
+fbBltOdd24 (FbBits *srcLine,
IcStride srcStrideEven,
IcStride srcStrideOdd,
int srcXEven,
@@ -805,7 +805,7 @@ IcBltOdd24 (FbBits *srcLine,
{
if (even)
{
- IcBlt24Line (srcLine, srcXEven, dstLine, dstXEven,
+ fbBlt24Line (srcLine, srcXEven, dstLine, dstXEven,
width, alu, pm, 0);
srcLine += srcStrideEven;
dstLine += dstStrideEven;
@@ -813,7 +813,7 @@ IcBltOdd24 (FbBits *srcLine,
}
else
{
- IcBlt24Line (srcLine, srcXOdd, dstLine, dstXOdd,
+ fbBlt24Line (srcLine, srcXOdd, dstLine, dstXOdd,
width, alu, pm, 0);
srcLine += srcStrideOdd;
dstLine += dstStrideOdd;
@@ -830,7 +830,7 @@ IcBltOdd24 (FbBits *srcLine,
#if FB_STIP_SHIFT != FB_SHIFT
void
-IcSetBltOdd (IcStip *stip,
+fbSetBltOdd (IcStip *stip,
IcStride stipStride,
int srcX,
FbBits **bits,
@@ -872,7 +872,7 @@ IcSetBltOdd (IcStip *stip,
#endif
void
-IcBltStip (IcStip *src,
+fbBltStip (IcStip *src,
IcStride srcStride, /* in IcStip units, not FbBits units */
int srcX,
@@ -903,12 +903,12 @@ IcBltStip (IcStip *src,
dst += dstX >> FB_STIP_SHIFT;
dstX &= FB_STIP_MASK;
- IcSetBltOdd (src, srcStride, srcX,
+ fbSetBltOdd (src, srcStride, srcX,
&s,
&srcStrideEven, &srcStrideOdd,
&srcXEven, &srcXOdd);
- IcSetBltOdd (dst, dstStride, dstX,
+ fbSetBltOdd (dst, dstStride, dstX,
&d,
&dstStrideEven, &dstStrideOdd,
&dstXEven, &dstXOdd);
@@ -916,7 +916,7 @@ IcBltStip (IcStip *src,
#ifdef FB_24BIT
if (bpp == 24 && !IcCheck24Pix (pm))
{
- IcBltOdd24 (s, srcStrideEven, srcStrideOdd,
+ fbBltOdd24 (s, srcStrideEven, srcStrideOdd,
srcXEven, srcXOdd,
d, dstStrideEven, dstStrideOdd,
@@ -927,7 +927,7 @@ IcBltStip (IcStip *src,
else
#endif
{
- IcBltOdd (s, srcStrideEven, srcStrideOdd,
+ fbBltOdd (s, srcStrideEven, srcStrideOdd,
srcXEven, srcXOdd,
d, dstStrideEven, dstStrideOdd,
@@ -939,7 +939,7 @@ IcBltStip (IcStip *src,
else
#endif
{
- IcBlt ((FbBits *) src, IcStipStrideToBitsStride (srcStride),
+ fbBlt ((FbBits *) src, IcStipStrideToBitsStride (srcStride),
srcX,
(FbBits *) dst, IcStipStrideToBitsStride (dstStride),
dstX,
diff --git a/pixman/src/icbltone.c b/pixman/src/icbltone.c
index a584a1bf..f0fa80b7 100644
--- a/pixman/src/icbltone.c
+++ b/pixman/src/icbltone.c
@@ -76,7 +76,7 @@
#endif
#if FB_SHIFT == 6
-static uint8_t const Ic8Lane[256] = {
+static uint8_t const fb8Lane[256] = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
@@ -93,49 +93,49 @@ static uint8_t const Ic8Lane[256] = {
242, 243, 244,245,246,247,248,249,250,251,252,253,254,255,
};
-static uint8_t const Ic16Lane[256] = {
+static uint8_t const fb16Lane[256] = {
0x00, 0x03, 0x0c, 0x0f,
0x30, 0x33, 0x3c, 0x3f,
0xc0, 0xc3, 0xcc, 0xcf,
0xf0, 0xf3, 0xfc, 0xff,
};
-static uint8_t const Ic32Lane[16] = {
+static uint8_t const fb32Lane[16] = {
0x00, 0x0f, 0xf0, 0xff,
};
#endif
#if FB_SHIFT == 5
-static uint8_t const Ic8Lane[16] = {
+static uint8_t const fb8Lane[16] = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
};
-static uint8_t const Ic16Lane[16] = {
+static uint8_t const fb16Lane[16] = {
0, 3, 12, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
};
-static uint8_t const Ic32Lane[16] = {
+static uint8_t const fb32Lane[16] = {
0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
};
#endif
static const uint8_t *
-IcLaneTable(int bpp)
+fbLaneTable(int bpp)
{
switch (bpp) {
case 8:
- return Ic8Lane;
+ return fb8Lane;
case 16:
- return Ic16Lane;
+ return fb16Lane;
case 32:
- return Ic32Lane;
+ return fb32Lane;
}
return 0;
}
#endif
void
-IcBltOne (IcStip *src,
+fbBltOne (IcStip *src,
IcStride srcStride, /* IcStip units per scanline */
int srcX, /* bit position of source */
FbBits *dst,
@@ -168,14 +168,14 @@ IcBltOne (IcStip *src,
int srcinc; /* source units consumed */
int endNeedsLoad = 0; /* need load for endmask */
#ifndef FBNOPIXADDR
- const uint8_t *IcLane;
+ const uint8_t *fbLane;
#endif
int startbyte, endbyte;
#ifdef FB_24BIT
if (dstBpp == 24)
{
- IcBltOne24 (src, srcStride, srcX,
+ fbBltOne24 (src, srcStride, srcX,
dst, dstStride, dstX, dstBpp,
width, height,
fgand, fgxor, bgand, bgxor);
@@ -235,11 +235,11 @@ IcBltOne (IcStip *src,
*/
icbits = 0; /* unused */
if (pixelsPerDst <= 8)
- icbits = IcStippleTable(pixelsPerDst);
+ icbits = fbStippleTable(pixelsPerDst);
#ifndef FBNOPIXADDR
- IcLane = 0;
+ fbLane = 0;
if (transparent && fgand == 0 && dstBpp >= 8)
- IcLane = IcLaneTable(dstBpp);
+ fbLane = fbLaneTable(dstBpp);
#endif
/*
@@ -301,9 +301,9 @@ IcBltOne (IcStip *src,
#endif
mask = icbits[IcLeftStipBits(bits,pixelsPerDst)];
#ifndef FBNOPIXADDR
- if (IcLane)
+ if (fbLane)
{
- IcTransparentSpan (dst, mask & startmask, fgxor, 1);
+ fbTransparentSpan (dst, mask & startmask, fgxor, 1);
}
else
#endif
@@ -342,11 +342,11 @@ IcBltOne (IcStip *src,
else
{
#ifndef FBNOPIXADDR
- if (IcLane)
+ if (fbLane)
{
while (bits && n)
{
- switch (IcLane[IcLeftStipBits(bits,pixelsPerDst)]) {
+ switch (fbLane[IcLeftStipBits(bits,pixelsPerDst)]) {
LaneCases((uint8_t *) dst);
}
bits = IcStipLeft(bits,pixelsPerDst);
@@ -399,9 +399,9 @@ IcBltOne (IcStip *src,
#endif
mask = icbits[IcLeftStipBits(bits,pixelsPerDst)];
#ifndef FBNOPIXADDR
- if (IcLane)
+ if (fbLane)
{
- IcTransparentSpan (dst, mask & endmask, fgxor, 1);
+ fbTransparentSpan (dst, mask & endmask, fgxor, 1);
}
else
#endif
@@ -455,7 +455,7 @@ IcBltOne (IcStip *src,
#define IcStip24New(rot) (2 + (rot != 0))
#define IcStip24Len 4
-static const FbBits icStipple24Bits[3][1 << IcStip24Len] = {
+static const FbBits fbStipple24Bits[3][1 << IcStip24Len] = {
/* rotate 0 */
{
C4_24( 0, 0), C4_24( 1, 0), C4_24( 2, 0), C4_24( 3, 0),
@@ -493,7 +493,7 @@ static const FbBits icStipple24Bits[3][1 << IcStip24Len] = {
#define IcStip24New(rot) (1 + (rot == 8))
#endif
-static const FbBits icStipple24Bits[3][1 << IcStip24Len] = {
+static const FbBits fbStipple24Bits[3][1 << IcStip24Len] = {
/* rotate 0 */
{
C2_24( 0, 0), C2_24 ( 1, 0), C2_24 ( 2, 0), C2_24 ( 3, 0),
@@ -527,7 +527,7 @@ static const FbBits icStipple24Bits[3][1 << IcStip24Len] = {
#endif
-#define IcFirstStipBits(len,stip) {\
+#define fbFirstStipBits(len,stip) {\
int __len = (len); \
if (len <= remain) { \
stip = IcLeftStipBits(bits, len); \
@@ -543,17 +543,17 @@ static const FbBits icStipple24Bits[3][1 << IcStip24Len] = {
remain -= __len; \
}
-#define IcInitStipBits(offset,len,stip) {\
+#define fbInitStipBits(offset,len,stip) {\
bits = IcStipLeft (*src++,offset); \
remain = FB_STIP_UNIT - offset; \
- IcFirstStipBits(len,stip); \
+ fbFirstStipBits(len,stip); \
stip = IcMergeStip24Bits (0, stip, len); \
}
-#define IcNextStipBits(rot,stip) {\
+#define fbNextStipBits(rot,stip) {\
int __new = IcStip24New(rot); \
IcStip __right; \
- IcFirstStipBits(__new, __right); \
+ fbFirstStipBits(__new, __right); \
stip = IcMergeStip24Bits (stip, __right, __new); \
rot = IcNext24Rot (rot); \
}
@@ -568,7 +568,7 @@ static const FbBits icStipple24Bits[3][1 << IcStip24Len] = {
* and text
*/
void
-IcBltOne24 (IcStip *srcLine,
+fbBltOne24 (IcStip *srcLine,
IcStride srcStride, /* IcStip units per scanline */
int srcX, /* bit position of source */
FbBits *dst,
@@ -618,30 +618,30 @@ IcBltOne24 (IcStip *srcLine,
rot = rot0;
src = srcLine;
srcLine += srcStride;
- IcInitStipBits (srcX,firstlen, stip);
+ fbInitStipBits (srcX,firstlen, stip);
if (leftMask)
{
- mask = icStipple24Bits[rot >> 3][stip];
+ mask = fbStipple24Bits[rot >> 3][stip];
*dst = (*dst & ~leftMask) | (IcOpaqueStipple (mask,
IcRot24(fgxor, rot),
IcRot24(bgxor, rot))
& leftMask);
dst++;
- IcNextStipBits(rot,stip);
+ fbNextStipBits(rot,stip);
}
nl = nlMiddle;
while (nl--)
{
- mask = icStipple24Bits[rot>>3][stip];
+ mask = fbStipple24Bits[rot>>3][stip];
*dst = IcOpaqueStipple (mask,
IcRot24(fgxor, rot),
IcRot24(bgxor, rot));
dst++;
- IcNextStipBits(rot,stip);
+ fbNextStipBits(rot,stip);
}
if (rightMask)
{
- mask = icStipple24Bits[rot >> 3][stip];
+ mask = fbStipple24Bits[rot >> 3][stip];
*dst = (*dst & ~rightMask) | (IcOpaqueStipple (mask,
IcRot24(fgxor, rot),
IcRot24(bgxor, rot))
@@ -659,33 +659,33 @@ IcBltOne24 (IcStip *srcLine,
rot = rot0;
src = srcLine;
srcLine += srcStride;
- IcInitStipBits (srcX, firstlen, stip);
+ fbInitStipBits (srcX, firstlen, stip);
if (leftMask)
{
if (stip)
{
- mask = icStipple24Bits[rot >> 3][stip] & leftMask;
+ mask = fbStipple24Bits[rot >> 3][stip] & leftMask;
*dst = (*dst & ~mask) | (IcRot24(fgxor, rot) & mask);
}
dst++;
- IcNextStipBits (rot, stip);
+ fbNextStipBits (rot, stip);
}
nl = nlMiddle;
while (nl--)
{
if (stip)
{
- mask = icStipple24Bits[rot>>3][stip];
+ mask = fbStipple24Bits[rot>>3][stip];
*dst = (*dst & ~mask) | (IcRot24(fgxor,rot) & mask);
}
dst++;
- IcNextStipBits (rot, stip);
+ fbNextStipBits (rot, stip);
}
if (rightMask)
{
if (stip)
{
- mask = icStipple24Bits[rot >> 3][stip] & rightMask;
+ mask = fbStipple24Bits[rot >> 3][stip] & rightMask;
*dst = (*dst & ~mask) | (IcRot24(fgxor, rot) & mask);
}
}
@@ -699,10 +699,10 @@ IcBltOne24 (IcStip *srcLine,
rot = rot0;
src = srcLine;
srcLine += srcStride;
- IcInitStipBits (srcX, firstlen, stip);
+ fbInitStipBits (srcX, firstlen, stip);
if (leftMask)
{
- mask = icStipple24Bits[rot >> 3][stip];
+ mask = fbStipple24Bits[rot >> 3][stip];
*dst = IcStippleRRopMask (*dst, mask,
IcRot24(fgand, rot),
IcRot24(fgxor, rot),
@@ -710,23 +710,23 @@ IcBltOne24 (IcStip *srcLine,
IcRot24(bgxor, rot),
leftMask);
dst++;
- IcNextStipBits(rot,stip);
+ fbNextStipBits(rot,stip);
}
nl = nlMiddle;
while (nl--)
{
- mask = icStipple24Bits[rot >> 3][stip];
+ mask = fbStipple24Bits[rot >> 3][stip];
*dst = IcStippleRRop (*dst, mask,
IcRot24(fgand, rot),
IcRot24(fgxor, rot),
IcRot24(bgand, rot),
IcRot24(bgxor, rot));
dst++;
- IcNextStipBits(rot,stip);
+ fbNextStipBits(rot,stip);
}
if (rightMask)
{
- mask = icStipple24Bits[rot >> 3][stip];
+ mask = fbStipple24Bits[rot >> 3][stip];
*dst = IcStippleRRopMask (*dst, mask,
IcRot24(fgand, rot),
IcRot24(fgxor, rot),
diff --git a/pixman/src/iccompose.c b/pixman/src/iccompose.c
index d6d64650..7394c382 100644
--- a/pixman/src/iccompose.c
+++ b/pixman/src/iccompose.c
@@ -36,7 +36,7 @@
*/
static uint32_t
-IcCombineMaskU (FbCompositeOperand *src,
+fbCombineMaskU (FbCompositeOperand *src,
FbCompositeOperand *msk)
{
uint32_t x;
@@ -63,7 +63,7 @@ IcCombineMaskU (FbCompositeOperand *src,
}
static IcCompSrc
-IcCombineMaskC (FbCompositeOperand *src,
+fbCombineMaskC (FbCompositeOperand *src,
FbCompositeOperand *msk)
{
IcCompSrc s;
@@ -118,7 +118,7 @@ IcCombineMaskC (FbCompositeOperand *src,
}
static uint32_t
-IcCombineMaskValueC (FbCompositeOperand *src,
+fbCombineMaskValueC (FbCompositeOperand *src,
FbCompositeOperand *msk)
{
uint32_t x;
@@ -150,7 +150,7 @@ IcCombineMaskValueC (FbCompositeOperand *src,
* Combine src and mask using IN, generating only the alpha component
*/
static uint32_t
-IcCombineMaskAlphaU (FbCompositeOperand *src,
+fbCombineMaskAlphaU (FbCompositeOperand *src,
FbCompositeOperand *msk)
{
uint32_t x;
@@ -172,7 +172,7 @@ IcCombineMaskAlphaU (FbCompositeOperand *src,
}
static uint32_t
-IcCombineMaskAlphaC (FbCompositeOperand *src,
+fbCombineMaskAlphaC (FbCompositeOperand *src,
FbCompositeOperand *msk)
{
uint32_t x;
@@ -214,7 +214,7 @@ fbCombineSrcU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- (*dst->store) (dst, IcCombineMaskU (src, msk));
+ (*dst->store) (dst, fbCombineMaskU (src, msk));
}
static void
@@ -222,7 +222,7 @@ fbCombineSrcC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- (*dst->store) (dst, IcCombineMaskValueC (src, msk));
+ (*dst->store) (dst, fbCombineMaskValueC (src, msk));
}
static void
@@ -243,7 +243,7 @@ fbCombineOverU (FbCompositeOperand *src,
uint16_t t;
uint32_t m,n,o,p;
- s = IcCombineMaskU (src, msk);
+ s = fbCombineMaskU (src, msk);
a = ~s >> 24;
if (a != 0xff)
{
@@ -271,7 +271,7 @@ fbCombineOverC (FbCompositeOperand *src,
uint16_t t;
uint32_t m,n,o,p;
- cs = IcCombineMaskC (src, msk);
+ cs = fbCombineMaskC (src, msk);
s = cs.value;
a = ~cs.alpha;
if (a != 0xffffffff)
@@ -303,7 +303,7 @@ fbCombineOverReverseU (FbCompositeOperand *src,
a = ~d >> 24;
if (a)
{
- s = IcCombineMaskU (src, msk);
+ s = fbCombineMaskU (src, msk);
if (a != 0xff)
{
m = IcOverU(d,s,0,a,t);
@@ -330,7 +330,7 @@ fbCombineOverReverseC (FbCompositeOperand *src,
a = ~d >> 24;
if (a)
{
- s = IcCombineMaskValueC (src, msk);
+ s = fbCombineMaskValueC (src, msk);
if (a != 0xff)
{
m = IcOverU(d,s,0,a,t);
@@ -358,7 +358,7 @@ fbCombineInU (FbCompositeOperand *src,
s = 0;
if (a)
{
- s = IcCombineMaskU (src, msk);
+ s = fbCombineMaskU (src, msk);
if (a != 0xff)
{
m = IcInU(s,0,a,t);
@@ -386,7 +386,7 @@ fbCombineInC (FbCompositeOperand *src,
s = 0;
if (a)
{
- s = IcCombineMaskValueC (src, msk);
+ s = fbCombineMaskValueC (src, msk);
if (a != 0xff)
{
m = IcInU(s,0,a,t);
@@ -409,7 +409,7 @@ fbCombineInReverseU (FbCompositeOperand *src,
uint16_t t;
uint32_t m,n,o,p;
- s = IcCombineMaskAlphaU (src, msk);
+ s = fbCombineMaskAlphaU (src, msk);
a = s >> 24;
if (a != 0xff)
{
@@ -437,7 +437,7 @@ fbCombineInReverseC (FbCompositeOperand *src,
uint16_t t;
uint32_t m,n,o,p;
- s = IcCombineMaskAlphaC (src, msk);
+ s = fbCombineMaskAlphaC (src, msk);
a = s;
if (a != 0xffffffff)
{
@@ -470,7 +470,7 @@ fbCombineOutU (FbCompositeOperand *src,
s = 0;
if (a)
{
- s = IcCombineMaskU (src, msk);
+ s = fbCombineMaskU (src, msk);
if (a != 0xff)
{
m = IcInU(s,0,a,t);
@@ -498,7 +498,7 @@ fbCombineOutC (FbCompositeOperand *src,
s = 0;
if (a)
{
- s = IcCombineMaskValueC (src, msk);
+ s = fbCombineMaskValueC (src, msk);
if (a != 0xff)
{
m = IcInU(s,0,a,t);
@@ -521,7 +521,7 @@ fbCombineOutReverseU (FbCompositeOperand *src,
uint16_t t;
uint32_t m,n,o,p;
- s = IcCombineMaskAlphaU (src, msk);
+ s = fbCombineMaskAlphaU (src, msk);
a = ~s >> 24;
if (a != 0xff)
{
@@ -549,7 +549,7 @@ fbCombineOutReverseC (FbCompositeOperand *src,
uint16_t t;
uint32_t m,n,o,p;
- s = IcCombineMaskAlphaC (src, msk);
+ s = fbCombineMaskAlphaC (src, msk);
a = ~s;
if (a != 0xffffffff)
{
@@ -577,7 +577,7 @@ fbCombineAtopU (FbCompositeOperand *src,
uint16_t t,u,v;
uint32_t m,n,o,p;
- s = IcCombineMaskU (src, msk);
+ s = fbCombineMaskU (src, msk);
d = (*dst->fetch) (dst);
ad = ~s >> 24;
as = d >> 24;
@@ -600,7 +600,7 @@ fbCombineAtopC (FbCompositeOperand *src,
uint16_t t, u, v;
uint32_t m,n,o,p;
- cs = IcCombineMaskC (src, msk);
+ cs = fbCombineMaskC (src, msk);
d = (*dst->fetch) (dst);
s = cs.value;
ad = cs.alpha;
@@ -622,7 +622,7 @@ fbCombineAtopReverseU (FbCompositeOperand *src,
uint16_t t, u, v;
uint32_t m,n,o,p;
- s = IcCombineMaskU (src, msk);
+ s = fbCombineMaskU (src, msk);
d = (*dst->fetch) (dst);
ad = s >> 24;
as = ~d >> 24;
@@ -644,7 +644,7 @@ fbCombineAtopReverseC (FbCompositeOperand *src,
uint16_t t, u, v;
uint32_t m,n,o,p;
- cs = IcCombineMaskC (src, msk);
+ cs = fbCombineMaskC (src, msk);
d = (*dst->fetch) (dst);
s = cs.value;
ad = cs.alpha;
@@ -666,7 +666,7 @@ fbCombineXorU (FbCompositeOperand *src,
uint16_t t, u, v;
uint32_t m,n,o,p;
- s = IcCombineMaskU (src, msk);
+ s = fbCombineMaskU (src, msk);
d = (*dst->fetch) (dst);
ad = ~s >> 24;
as = ~d >> 24;
@@ -688,7 +688,7 @@ fbCombineXorC (FbCompositeOperand *src,
uint16_t t, u, v;
uint32_t m,n,o,p;
- cs = IcCombineMaskC (src, msk);
+ cs = fbCombineMaskC (src, msk);
d = (*dst->fetch) (dst);
s = cs.value;
ad = ~cs.alpha;
@@ -709,7 +709,7 @@ fbCombineAddU (FbCompositeOperand *src,
uint16_t t;
uint32_t m,n,o,p;
- s = IcCombineMaskU (src, msk);
+ s = fbCombineMaskU (src, msk);
if (s == ~0)
(*dst->store) (dst, s);
else
@@ -735,7 +735,7 @@ fbCombineAddC (FbCompositeOperand *src,
uint16_t t;
uint32_t m,n,o,p;
- s = IcCombineMaskValueC (src, msk);
+ s = fbCombineMaskValueC (src, msk);
if (s == ~0)
(*dst->store) (dst, s);
else
@@ -793,7 +793,7 @@ fbCombineAddC (FbCompositeOperand *src,
/* portion covered by a but not b */
static uint8_t
-IcCombineDisjointOutPart (uint8_t a, uint8_t b)
+fbCombineDisjointOutPart (uint8_t a, uint8_t b)
{
/* min (1, (1-b) / a) */
@@ -805,7 +805,7 @@ IcCombineDisjointOutPart (uint8_t a, uint8_t b)
/* portion covered by both a and b */
static uint8_t
-IcCombineDisjointInPart (uint8_t a, uint8_t b)
+fbCombineDisjointInPart (uint8_t a, uint8_t b)
{
/* max (1-(1-b)/a,0) */
/* = - min ((1-b)/a - 1, 0) */
@@ -818,7 +818,7 @@ IcCombineDisjointInPart (uint8_t a, uint8_t b)
}
static void
-IcCombineDisjointGeneralU (FbCompositeOperand *src,
+fbCombineDisjointGeneralU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst,
uint8_t combine)
@@ -828,7 +828,7 @@ IcCombineDisjointGeneralU (FbCompositeOperand *src,
uint16_t Fa, Fb, t, u, v;
uint8_t sa, da;
- s = IcCombineMaskU (src, msk);
+ s = fbCombineMaskU (src, msk);
sa = s >> 24;
d = (*dst->fetch) (dst);
@@ -839,10 +839,10 @@ IcCombineDisjointGeneralU (FbCompositeOperand *src,
Fa = 0;
break;
case CombineAOut:
- Fa = IcCombineDisjointOutPart (sa, da);
+ Fa = fbCombineDisjointOutPart (sa, da);
break;
case CombineAIn:
- Fa = IcCombineDisjointInPart (sa, da);
+ Fa = fbCombineDisjointInPart (sa, da);
break;
case CombineA:
Fa = 0xff;
@@ -854,10 +854,10 @@ IcCombineDisjointGeneralU (FbCompositeOperand *src,
Fb = 0;
break;
case CombineBOut:
- Fb = IcCombineDisjointOutPart (da, sa);
+ Fb = fbCombineDisjointOutPart (da, sa);
break;
case CombineBIn:
- Fb = IcCombineDisjointInPart (da, sa);
+ Fb = fbCombineDisjointInPart (da, sa);
break;
case CombineB:
Fb = 0xff;
@@ -872,7 +872,7 @@ IcCombineDisjointGeneralU (FbCompositeOperand *src,
}
static void
-IcCombineDisjointGeneralC (FbCompositeOperand *src,
+fbCombineDisjointGeneralC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst,
uint8_t combine)
@@ -885,7 +885,7 @@ IcCombineDisjointGeneralC (FbCompositeOperand *src,
uint32_t sa;
uint8_t da;
- cs = IcCombineMaskC (src, msk);
+ cs = fbCombineMaskC (src, msk);
s = cs.value;
sa = cs.alpha;
@@ -897,17 +897,17 @@ IcCombineDisjointGeneralC (FbCompositeOperand *src,
Fa = 0;
break;
case CombineAOut:
- m = IcCombineDisjointOutPart ((uint8_t) (sa >> 0), da);
- n = IcCombineDisjointOutPart ((uint8_t) (sa >> 8), da) << 8;
- o = IcCombineDisjointOutPart ((uint8_t) (sa >> 16), da) << 16;
- p = IcCombineDisjointOutPart ((uint8_t) (sa >> 24), da) << 24;
+ m = fbCombineDisjointOutPart ((uint8_t) (sa >> 0), da);
+ n = fbCombineDisjointOutPart ((uint8_t) (sa >> 8), da) << 8;
+ o = fbCombineDisjointOutPart ((uint8_t) (sa >> 16), da) << 16;
+ p = fbCombineDisjointOutPart ((uint8_t) (sa >> 24), da) << 24;
Fa = m|n|o|p;
break;
case CombineAIn:
- m = IcCombineDisjointOutPart ((uint8_t) (sa >> 0), da);
- n = IcCombineDisjointOutPart ((uint8_t) (sa >> 8), da) << 8;
- o = IcCombineDisjointOutPart ((uint8_t) (sa >> 16), da) << 16;
- p = IcCombineDisjointOutPart ((uint8_t) (sa >> 24), da) << 24;
+ m = fbCombineDisjointOutPart ((uint8_t) (sa >> 0), da);
+ n = fbCombineDisjointOutPart ((uint8_t) (sa >> 8), da) << 8;
+ o = fbCombineDisjointOutPart ((uint8_t) (sa >> 16), da) << 16;
+ p = fbCombineDisjointOutPart ((uint8_t) (sa >> 24), da) << 24;
Fa = m|n|o|p;
break;
case CombineA:
@@ -920,10 +920,10 @@ IcCombineDisjointGeneralC (FbCompositeOperand *src,
Fb = 0;
break;
case CombineBOut:
- Fb = IcCombineDisjointOutPart (da, sa);
+ Fb = fbCombineDisjointOutPart (da, sa);
break;
case CombineBIn:
- Fb = IcCombineDisjointInPart (da, sa);
+ Fb = fbCombineDisjointInPart (da, sa);
break;
case CombineB:
Fb = 0xff;
@@ -947,14 +947,14 @@ fbCombineDisjointOverU (FbCompositeOperand *src,
uint16_t t;
uint32_t m,n,o,p;
- s = IcCombineMaskU (src, msk);
+ s = fbCombineMaskU (src, msk);
a = s >> 24;
if (a != 0x00)
{
if (a != 0xff)
{
d = (*dst->fetch) (dst);
- a = IcCombineDisjointOutPart (d >> 24, a);
+ 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);
@@ -970,7 +970,7 @@ fbCombineDisjointOverC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineDisjointGeneralC (src, msk, dst, CombineAOver);
+ fbCombineDisjointGeneralC (src, msk, dst, CombineAOver);
}
static void
@@ -978,7 +978,7 @@ fbCombineDisjointOverReverseU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineDisjointGeneralU (src, msk, dst, CombineBOver);
+ fbCombineDisjointGeneralU (src, msk, dst, CombineBOver);
}
static void
@@ -986,7 +986,7 @@ fbCombineDisjointOverReverseC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineDisjointGeneralC (src, msk, dst, CombineBOver);
+ fbCombineDisjointGeneralC (src, msk, dst, CombineBOver);
}
static void
@@ -994,7 +994,7 @@ fbCombineDisjointInU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineDisjointGeneralU (src, msk, dst, CombineAIn);
+ fbCombineDisjointGeneralU (src, msk, dst, CombineAIn);
}
static void
@@ -1002,7 +1002,7 @@ fbCombineDisjointInC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineDisjointGeneralC (src, msk, dst, CombineAIn);
+ fbCombineDisjointGeneralC (src, msk, dst, CombineAIn);
}
static void
@@ -1010,7 +1010,7 @@ fbCombineDisjointInReverseU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineDisjointGeneralU (src, msk, dst, CombineBIn);
+ fbCombineDisjointGeneralU (src, msk, dst, CombineBIn);
}
static void
@@ -1018,7 +1018,7 @@ fbCombineDisjointInReverseC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineDisjointGeneralC (src, msk, dst, CombineBIn);
+ fbCombineDisjointGeneralC (src, msk, dst, CombineBIn);
}
static void
@@ -1026,7 +1026,7 @@ fbCombineDisjointOutU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineDisjointGeneralU (src, msk, dst, CombineAOut);
+ fbCombineDisjointGeneralU (src, msk, dst, CombineAOut);
}
static void
@@ -1034,7 +1034,7 @@ fbCombineDisjointOutC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineDisjointGeneralC (src, msk, dst, CombineAOut);
+ fbCombineDisjointGeneralC (src, msk, dst, CombineAOut);
}
static void
@@ -1042,7 +1042,7 @@ fbCombineDisjointOutReverseU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineDisjointGeneralU (src, msk, dst, CombineBOut);
+ fbCombineDisjointGeneralU (src, msk, dst, CombineBOut);
}
static void
@@ -1050,7 +1050,7 @@ fbCombineDisjointOutReverseC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineDisjointGeneralC (src, msk, dst, CombineBOut);
+ fbCombineDisjointGeneralC (src, msk, dst, CombineBOut);
}
static void
@@ -1058,7 +1058,7 @@ fbCombineDisjointAtopU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineDisjointGeneralU (src, msk, dst, CombineAAtop);
+ fbCombineDisjointGeneralU (src, msk, dst, CombineAAtop);
}
static void
@@ -1066,7 +1066,7 @@ fbCombineDisjointAtopC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineDisjointGeneralC (src, msk, dst, CombineAAtop);
+ fbCombineDisjointGeneralC (src, msk, dst, CombineAAtop);
}
static void
@@ -1074,7 +1074,7 @@ fbCombineDisjointAtopReverseU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineDisjointGeneralU (src, msk, dst, CombineBAtop);
+ fbCombineDisjointGeneralU (src, msk, dst, CombineBAtop);
}
static void
@@ -1082,7 +1082,7 @@ fbCombineDisjointAtopReverseC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineDisjointGeneralC (src, msk, dst, CombineBAtop);
+ fbCombineDisjointGeneralC (src, msk, dst, CombineBAtop);
}
static void
@@ -1090,7 +1090,7 @@ fbCombineDisjointXorU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineDisjointGeneralU (src, msk, dst, CombineXor);
+ fbCombineDisjointGeneralU (src, msk, dst, CombineXor);
}
static void
@@ -1098,12 +1098,12 @@ fbCombineDisjointXorC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineDisjointGeneralC (src, msk, dst, CombineXor);
+ fbCombineDisjointGeneralC (src, msk, dst, CombineXor);
}
/* portion covered by a but not b */
static uint8_t
-IcCombineConjointOutPart (uint8_t a, uint8_t b)
+fbCombineConjointOutPart (uint8_t a, uint8_t b)
{
/* max (1-b/a,0) */
/* = 1-min(b/a,1) */
@@ -1117,7 +1117,7 @@ IcCombineConjointOutPart (uint8_t a, uint8_t b)
/* portion covered by both a and b */
static uint8_t
-IcCombineConjointInPart (uint8_t a, uint8_t b)
+fbCombineConjointInPart (uint8_t a, uint8_t b)
{
/* min (1,b/a) */
@@ -1127,7 +1127,7 @@ IcCombineConjointInPart (uint8_t a, uint8_t b)
}
static void
-IcCombineConjointGeneralU (FbCompositeOperand *src,
+fbCombineConjointGeneralU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst,
uint8_t combine)
@@ -1137,7 +1137,7 @@ IcCombineConjointGeneralU (FbCompositeOperand *src,
uint16_t Fa, Fb, t, u, v;
uint8_t sa, da;
- s = IcCombineMaskU (src, msk);
+ s = fbCombineMaskU (src, msk);
sa = s >> 24;
d = (*dst->fetch) (dst);
@@ -1148,10 +1148,10 @@ IcCombineConjointGeneralU (FbCompositeOperand *src,
Fa = 0;
break;
case CombineAOut:
- Fa = IcCombineConjointOutPart (sa, da);
+ Fa = fbCombineConjointOutPart (sa, da);
break;
case CombineAIn:
- Fa = IcCombineConjointInPart (sa, da);
+ Fa = fbCombineConjointInPart (sa, da);
break;
case CombineA:
Fa = 0xff;
@@ -1163,10 +1163,10 @@ IcCombineConjointGeneralU (FbCompositeOperand *src,
Fb = 0;
break;
case CombineBOut:
- Fb = IcCombineConjointOutPart (da, sa);
+ Fb = fbCombineConjointOutPart (da, sa);
break;
case CombineBIn:
- Fb = IcCombineConjointInPart (da, sa);
+ Fb = fbCombineConjointInPart (da, sa);
break;
case CombineB:
Fb = 0xff;
@@ -1181,7 +1181,7 @@ IcCombineConjointGeneralU (FbCompositeOperand *src,
}
static void
-IcCombineConjointGeneralC (FbCompositeOperand *src,
+fbCombineConjointGeneralC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst,
uint8_t combine)
@@ -1194,7 +1194,7 @@ IcCombineConjointGeneralC (FbCompositeOperand *src,
uint32_t sa;
uint8_t da;
- cs = IcCombineMaskC (src, msk);
+ cs = fbCombineMaskC (src, msk);
s = cs.value;
sa = cs.alpha;
@@ -1206,17 +1206,17 @@ IcCombineConjointGeneralC (FbCompositeOperand *src,
Fa = 0;
break;
case CombineAOut:
- m = IcCombineConjointOutPart ((uint8_t) (sa >> 0), da);
- n = IcCombineConjointOutPart ((uint8_t) (sa >> 8), da) << 8;
- o = IcCombineConjointOutPart ((uint8_t) (sa >> 16), da) << 16;
- p = IcCombineConjointOutPart ((uint8_t) (sa >> 24), da) << 24;
+ m = fbCombineConjointOutPart ((uint8_t) (sa >> 0), da);
+ n = fbCombineConjointOutPart ((uint8_t) (sa >> 8), da) << 8;
+ o = fbCombineConjointOutPart ((uint8_t) (sa >> 16), da) << 16;
+ p = fbCombineConjointOutPart ((uint8_t) (sa >> 24), da) << 24;
Fa = m|n|o|p;
break;
case CombineAIn:
- m = IcCombineConjointOutPart ((uint8_t) (sa >> 0), da);
- n = IcCombineConjointOutPart ((uint8_t) (sa >> 8), da) << 8;
- o = IcCombineConjointOutPart ((uint8_t) (sa >> 16), da) << 16;
- p = IcCombineConjointOutPart ((uint8_t) (sa >> 24), da) << 24;
+ m = fbCombineConjointOutPart ((uint8_t) (sa >> 0), da);
+ n = fbCombineConjointOutPart ((uint8_t) (sa >> 8), da) << 8;
+ o = fbCombineConjointOutPart ((uint8_t) (sa >> 16), da) << 16;
+ p = fbCombineConjointOutPart ((uint8_t) (sa >> 24), da) << 24;
Fa = m|n|o|p;
break;
case CombineA:
@@ -1229,10 +1229,10 @@ IcCombineConjointGeneralC (FbCompositeOperand *src,
Fb = 0;
break;
case CombineBOut:
- Fb = IcCombineConjointOutPart (da, sa);
+ Fb = fbCombineConjointOutPart (da, sa);
break;
case CombineBIn:
- Fb = IcCombineConjointInPart (da, sa);
+ Fb = fbCombineConjointInPart (da, sa);
break;
case CombineB:
Fb = 0xff;
@@ -1251,21 +1251,21 @@ fbCombineConjointOverU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineConjointGeneralU (src, msk, dst, CombineAOver);
+ fbCombineConjointGeneralU (src, msk, dst, CombineAOver);
/*
uint32_t s, d;
uint16_t a;
uint16_t t;
uint32_t m,n,o,p;
- s = IcCombineMaskU (src, msk);
+ s = fbCombineMaskU (src, msk);
a = s >> 24;
if (a != 0x00)
{
if (a != 0xff)
{
d = (*dst->fetch) (dst);
- a = IcCombineConjointOutPart (d >> 24, a);
+ 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);
@@ -1282,7 +1282,7 @@ fbCombineConjointOverC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineConjointGeneralC (src, msk, dst, CombineAOver);
+ fbCombineConjointGeneralC (src, msk, dst, CombineAOver);
}
static void
@@ -1290,7 +1290,7 @@ fbCombineConjointOverReverseU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineConjointGeneralU (src, msk, dst, CombineBOver);
+ fbCombineConjointGeneralU (src, msk, dst, CombineBOver);
}
static void
@@ -1298,7 +1298,7 @@ fbCombineConjointOverReverseC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineConjointGeneralC (src, msk, dst, CombineBOver);
+ fbCombineConjointGeneralC (src, msk, dst, CombineBOver);
}
static void
@@ -1306,7 +1306,7 @@ fbCombineConjointInU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineConjointGeneralU (src, msk, dst, CombineAIn);
+ fbCombineConjointGeneralU (src, msk, dst, CombineAIn);
}
static void
@@ -1314,7 +1314,7 @@ fbCombineConjointInC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineConjointGeneralC (src, msk, dst, CombineAIn);
+ fbCombineConjointGeneralC (src, msk, dst, CombineAIn);
}
static void
@@ -1322,7 +1322,7 @@ fbCombineConjointInReverseU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineConjointGeneralU (src, msk, dst, CombineBIn);
+ fbCombineConjointGeneralU (src, msk, dst, CombineBIn);
}
static void
@@ -1330,7 +1330,7 @@ fbCombineConjointInReverseC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineConjointGeneralC (src, msk, dst, CombineBIn);
+ fbCombineConjointGeneralC (src, msk, dst, CombineBIn);
}
static void
@@ -1338,7 +1338,7 @@ fbCombineConjointOutU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineConjointGeneralU (src, msk, dst, CombineAOut);
+ fbCombineConjointGeneralU (src, msk, dst, CombineAOut);
}
static void
@@ -1346,7 +1346,7 @@ fbCombineConjointOutC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineConjointGeneralC (src, msk, dst, CombineAOut);
+ fbCombineConjointGeneralC (src, msk, dst, CombineAOut);
}
static void
@@ -1354,7 +1354,7 @@ fbCombineConjointOutReverseU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineConjointGeneralU (src, msk, dst, CombineBOut);
+ fbCombineConjointGeneralU (src, msk, dst, CombineBOut);
}
static void
@@ -1362,7 +1362,7 @@ fbCombineConjointOutReverseC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineConjointGeneralC (src, msk, dst, CombineBOut);
+ fbCombineConjointGeneralC (src, msk, dst, CombineBOut);
}
static void
@@ -1370,7 +1370,7 @@ fbCombineConjointAtopU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineConjointGeneralU (src, msk, dst, CombineAAtop);
+ fbCombineConjointGeneralU (src, msk, dst, CombineAAtop);
}
static void
@@ -1378,7 +1378,7 @@ fbCombineConjointAtopC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineConjointGeneralC (src, msk, dst, CombineAAtop);
+ fbCombineConjointGeneralC (src, msk, dst, CombineAAtop);
}
static void
@@ -1386,7 +1386,7 @@ fbCombineConjointAtopReverseU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineConjointGeneralU (src, msk, dst, CombineBAtop);
+ fbCombineConjointGeneralU (src, msk, dst, CombineBAtop);
}
static void
@@ -1394,7 +1394,7 @@ fbCombineConjointAtopReverseC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineConjointGeneralC (src, msk, dst, CombineBAtop);
+ fbCombineConjointGeneralC (src, msk, dst, CombineBAtop);
}
static void
@@ -1402,7 +1402,7 @@ fbCombineConjointXorU (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineConjointGeneralU (src, msk, dst, CombineXor);
+ fbCombineConjointGeneralU (src, msk, dst, CombineXor);
}
static void
@@ -1410,10 +1410,10 @@ fbCombineConjointXorC (FbCompositeOperand *src,
FbCompositeOperand *msk,
FbCompositeOperand *dst)
{
- IcCombineConjointGeneralC (src, msk, dst, CombineXor);
+ fbCombineConjointGeneralC (src, msk, dst, CombineXor);
}
-static IcCombineFunc const IcCombineFuncU[] = {
+static IcCombineFunc const fbCombineFuncU[] = {
fbCombineClear,
fbCombineSrcU,
fbCombineDst,
@@ -1460,7 +1460,7 @@ static IcCombineFunc const IcCombineFuncU[] = {
fbCombineConjointXorU,
};
-static IcCombineFunc const IcCombineFuncC[] = {
+static IcCombineFunc const fbCombineFuncC[] = {
fbCombineClear,
fbCombineSrcC,
fbCombineDst,
@@ -1512,21 +1512,21 @@ static IcCombineFunc const IcCombineFuncC[] = {
*/
static uint32_t
-IcFetch_a8r8g8b8 (FbCompositeOperand *op)
+fbFetch_a8r8g8b8 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
return ((uint32_t *)line)[offset >> 5];
}
static uint32_t
-IcFetch_x8r8g8b8 (FbCompositeOperand *op)
+fbFetch_x8r8g8b8 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
return ((uint32_t *)line)[offset >> 5] | 0xff000000;
}
static uint32_t
-IcFetch_a8b8g8r8 (FbCompositeOperand *op)
+fbFetch_a8b8g8r8 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel = ((uint32_t *)line)[offset >> 5];
@@ -1538,7 +1538,7 @@ IcFetch_a8b8g8r8 (FbCompositeOperand *op)
}
static uint32_t
-IcFetch_x8b8g8r8 (FbCompositeOperand *op)
+fbFetch_x8b8g8r8 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel = ((uint32_t *)line)[offset >> 5];
@@ -1550,7 +1550,7 @@ IcFetch_x8b8g8r8 (FbCompositeOperand *op)
}
static uint32_t
-IcFetch_r8g8b8 (FbCompositeOperand *op)
+fbFetch_r8g8b8 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint8_t *pixel = ((uint8_t *) line) + (offset >> 3);
@@ -1568,7 +1568,7 @@ IcFetch_r8g8b8 (FbCompositeOperand *op)
}
static uint32_t
-IcFetch_b8g8r8 (FbCompositeOperand *op)
+fbFetch_b8g8r8 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint8_t *pixel = ((uint8_t *) line) + (offset >> 3);
@@ -1586,7 +1586,7 @@ IcFetch_b8g8r8 (FbCompositeOperand *op)
}
static uint32_t
-IcFetch_r5g6b5 (FbCompositeOperand *op)
+fbFetch_r5g6b5 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel = ((uint16_t *) line)[offset >> 4];
@@ -1599,7 +1599,7 @@ IcFetch_r5g6b5 (FbCompositeOperand *op)
}
static uint32_t
-IcFetch_b5g6r5 (FbCompositeOperand *op)
+fbFetch_b5g6r5 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel = ((uint16_t *) line)[offset >> 4];
@@ -1612,7 +1612,7 @@ IcFetch_b5g6r5 (FbCompositeOperand *op)
}
static uint32_t
-IcFetch_a1r5g5b5 (FbCompositeOperand *op)
+fbFetch_a1r5g5b5 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel = ((uint16_t *) line)[offset >> 4];
@@ -1626,7 +1626,7 @@ IcFetch_a1r5g5b5 (FbCompositeOperand *op)
}
static uint32_t
-IcFetch_x1r5g5b5 (FbCompositeOperand *op)
+fbFetch_x1r5g5b5 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel = ((uint16_t *) line)[offset >> 4];
@@ -1639,7 +1639,7 @@ IcFetch_x1r5g5b5 (FbCompositeOperand *op)
}
static uint32_t
-IcFetch_a1b5g5r5 (FbCompositeOperand *op)
+fbFetch_a1b5g5r5 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel = ((uint16_t *) line)[offset >> 4];
@@ -1653,7 +1653,7 @@ IcFetch_a1b5g5r5 (FbCompositeOperand *op)
}
static uint32_t
-IcFetch_x1b5g5r5 (FbCompositeOperand *op)
+fbFetch_x1b5g5r5 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel = ((uint16_t *) line)[offset >> 4];
@@ -1666,7 +1666,7 @@ IcFetch_x1b5g5r5 (FbCompositeOperand *op)
}
static uint32_t
-IcFetch_a4r4g4b4 (FbCompositeOperand *op)
+fbFetch_a4r4g4b4 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel = ((uint16_t *) line)[offset >> 4];
@@ -1680,7 +1680,7 @@ IcFetch_a4r4g4b4 (FbCompositeOperand *op)
}
static uint32_t
-IcFetch_x4r4g4b4 (FbCompositeOperand *op)
+fbFetch_x4r4g4b4 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel = ((uint16_t *) line)[offset >> 4];
@@ -1693,7 +1693,7 @@ IcFetch_x4r4g4b4 (FbCompositeOperand *op)
}
static uint32_t
-IcFetch_a4b4g4r4 (FbCompositeOperand *op)
+fbFetch_a4b4g4r4 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel = ((uint16_t *) line)[offset >> 4];
@@ -1707,7 +1707,7 @@ IcFetch_a4b4g4r4 (FbCompositeOperand *op)
}
static uint32_t
-IcFetch_x4b4g4r4 (FbCompositeOperand *op)
+fbFetch_x4b4g4r4 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel = ((uint16_t *) line)[offset >> 4];
@@ -1720,7 +1720,7 @@ IcFetch_x4b4g4r4 (FbCompositeOperand *op)
}
static uint32_t
-IcFetch_a8 (FbCompositeOperand *op)
+fbFetch_a8 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel = ((uint8_t *) line)[offset>>3];
@@ -1729,7 +1729,7 @@ IcFetch_a8 (FbCompositeOperand *op)
}
static uint32_t
-IcFetcha_a8 (FbCompositeOperand *op)
+fbFetcha_a8 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel = ((uint8_t *) line)[offset>>3];
@@ -1740,7 +1740,7 @@ IcFetcha_a8 (FbCompositeOperand *op)
}
static uint32_t
-IcFetch_r3g3b2 (FbCompositeOperand *op)
+fbFetch_r3g3b2 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel = ((uint8_t *) line)[offset>>3];
@@ -1756,7 +1756,7 @@ IcFetch_r3g3b2 (FbCompositeOperand *op)
}
static uint32_t
-IcFetch_b2g3r3 (FbCompositeOperand *op)
+fbFetch_b2g3r3 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel = ((uint8_t *) line)[offset>>3];
@@ -1774,7 +1774,7 @@ IcFetch_b2g3r3 (FbCompositeOperand *op)
}
static uint32_t
-IcFetch_a2r2g2b2 (FbCompositeOperand *op)
+fbFetch_a2r2g2b2 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel = ((uint8_t *) line)[offset>>3];
@@ -1795,7 +1795,7 @@ IcFetch_a2r2g2b2 (FbCompositeOperand *op)
#endif
static uint32_t
-IcFetch_a4 (FbCompositeOperand *op)
+fbFetch_a4 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel = Fetch4(line, offset);
@@ -1805,7 +1805,7 @@ IcFetch_a4 (FbCompositeOperand *op)
}
static uint32_t
-IcFetcha_a4 (FbCompositeOperand *op)
+fbFetcha_a4 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel = Fetch4(line, offset);
@@ -1817,7 +1817,7 @@ IcFetcha_a4 (FbCompositeOperand *op)
}
static uint32_t
-IcFetch_r1g2b1 (FbCompositeOperand *op)
+fbFetch_r1g2b1 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel = Fetch4(line, offset);
@@ -1830,7 +1830,7 @@ IcFetch_r1g2b1 (FbCompositeOperand *op)
}
static uint32_t
-IcFetch_b1g2r1 (FbCompositeOperand *op)
+fbFetch_b1g2r1 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel = Fetch4(line, offset);
@@ -1843,7 +1843,7 @@ IcFetch_b1g2r1 (FbCompositeOperand *op)
}
static uint32_t
-IcFetch_a1r1g1b1 (FbCompositeOperand *op)
+fbFetch_a1r1g1b1 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel = Fetch4(line, offset);
@@ -1857,7 +1857,7 @@ IcFetch_a1r1g1b1 (FbCompositeOperand *op)
}
static uint32_t
-IcFetch_a1b1g1r1 (FbCompositeOperand *op)
+fbFetch_a1b1g1r1 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel = Fetch4(line, offset);
@@ -1871,7 +1871,7 @@ IcFetch_a1b1g1r1 (FbCompositeOperand *op)
}
static uint32_t
-IcFetcha_a1 (FbCompositeOperand *op)
+fbFetcha_a1 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel = ((uint32_t *)line)[offset >> 5];
@@ -1891,7 +1891,7 @@ IcFetcha_a1 (FbCompositeOperand *op)
}
static uint32_t
-IcFetch_a1 (FbCompositeOperand *op)
+fbFetch_a1 (FbCompositeOperand *op)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel = ((uint32_t *)line)[offset >> 5];
@@ -1916,21 +1916,21 @@ IcFetch_a1 (FbCompositeOperand *op)
#define Split(v) uint32_t r = ((v) >> 16) & 0xff, g = ((v) >> 8) & 0xff, b = (v) & 0xff
static void
-IcStore_a8r8g8b8 (FbCompositeOperand *op, uint32_t value)
+fbStore_a8r8g8b8 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
((uint32_t *)line)[offset >> 5] = value;
}
static void
-IcStore_x8r8g8b8 (FbCompositeOperand *op, uint32_t value)
+fbStore_x8r8g8b8 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
((uint32_t *)line)[offset >> 5] = value & 0xffffff;
}
static void
-IcStore_a8b8g8r8 (FbCompositeOperand *op, uint32_t value)
+fbStore_a8b8g8r8 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
Splita(value);
@@ -1938,7 +1938,7 @@ IcStore_a8b8g8r8 (FbCompositeOperand *op, uint32_t value)
}
static void
-IcStore_x8b8g8r8 (FbCompositeOperand *op, uint32_t value)
+fbStore_x8b8g8r8 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
Split(value);
@@ -1946,7 +1946,7 @@ IcStore_x8b8g8r8 (FbCompositeOperand *op, uint32_t value)
}
static void
-IcStore_r8g8b8 (FbCompositeOperand *op, uint32_t value)
+fbStore_r8g8b8 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint8_t *pixel = ((uint8_t *) line) + (offset >> 3);
@@ -1963,7 +1963,7 @@ IcStore_r8g8b8 (FbCompositeOperand *op, uint32_t value)
}
static void
-IcStore_b8g8r8 (FbCompositeOperand *op, uint32_t value)
+fbStore_b8g8r8 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint8_t *pixel = ((uint8_t *) line) + (offset >> 3);
@@ -1980,7 +1980,7 @@ IcStore_b8g8r8 (FbCompositeOperand *op, uint32_t value)
}
static void
-IcStore_r5g6b5 (FbCompositeOperand *op, uint32_t value)
+fbStore_r5g6b5 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint16_t *pixel = ((uint16_t *) line) + (offset >> 4);
@@ -1991,7 +1991,7 @@ IcStore_r5g6b5 (FbCompositeOperand *op, uint32_t value)
}
static void
-IcStore_b5g6r5 (FbCompositeOperand *op, uint32_t value)
+fbStore_b5g6r5 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint16_t *pixel = ((uint16_t *) line) + (offset >> 4);
@@ -2002,7 +2002,7 @@ IcStore_b5g6r5 (FbCompositeOperand *op, uint32_t value)
}
static void
-IcStore_a1r5g5b5 (FbCompositeOperand *op, uint32_t value)
+fbStore_a1r5g5b5 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint16_t *pixel = ((uint16_t *) line) + (offset >> 4);
@@ -2014,7 +2014,7 @@ IcStore_a1r5g5b5 (FbCompositeOperand *op, uint32_t value)
}
static void
-IcStore_x1r5g5b5 (FbCompositeOperand *op, uint32_t value)
+fbStore_x1r5g5b5 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint16_t *pixel = ((uint16_t *) line) + (offset >> 4);
@@ -2025,7 +2025,7 @@ IcStore_x1r5g5b5 (FbCompositeOperand *op, uint32_t value)
}
static void
-IcStore_a1b5g5r5 (FbCompositeOperand *op, uint32_t value)
+fbStore_a1b5g5r5 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint16_t *pixel = ((uint16_t *) line) + (offset >> 4);
@@ -2037,7 +2037,7 @@ IcStore_a1b5g5r5 (FbCompositeOperand *op, uint32_t value)
}
static void
-IcStore_x1b5g5r5 (FbCompositeOperand *op, uint32_t value)
+fbStore_x1b5g5r5 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint16_t *pixel = ((uint16_t *) line) + (offset >> 4);
@@ -2048,7 +2048,7 @@ IcStore_x1b5g5r5 (FbCompositeOperand *op, uint32_t value)
}
static void
-IcStore_a4r4g4b4 (FbCompositeOperand *op, uint32_t value)
+fbStore_a4r4g4b4 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint16_t *pixel = ((uint16_t *) line) + (offset >> 4);
@@ -2060,7 +2060,7 @@ IcStore_a4r4g4b4 (FbCompositeOperand *op, uint32_t value)
}
static void
-IcStore_x4r4g4b4 (FbCompositeOperand *op, uint32_t value)
+fbStore_x4r4g4b4 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint16_t *pixel = ((uint16_t *) line) + (offset >> 4);
@@ -2071,7 +2071,7 @@ IcStore_x4r4g4b4 (FbCompositeOperand *op, uint32_t value)
}
static void
-IcStore_a4b4g4r4 (FbCompositeOperand *op, uint32_t value)
+fbStore_a4b4g4r4 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint16_t *pixel = ((uint16_t *) line) + (offset >> 4);
@@ -2083,7 +2083,7 @@ IcStore_a4b4g4r4 (FbCompositeOperand *op, uint32_t value)
}
static void
-IcStore_x4b4g4r4 (FbCompositeOperand *op, uint32_t value)
+fbStore_x4b4g4r4 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint16_t *pixel = ((uint16_t *) line) + (offset >> 4);
@@ -2094,7 +2094,7 @@ IcStore_x4b4g4r4 (FbCompositeOperand *op, uint32_t value)
}
static void
-IcStore_a8 (FbCompositeOperand *op, uint32_t value)
+fbStore_a8 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint8_t *pixel = ((uint8_t *) line) + (offset >> 3);
@@ -2102,7 +2102,7 @@ IcStore_a8 (FbCompositeOperand *op, uint32_t value)
}
static void
-IcStore_r3g3b2 (FbCompositeOperand *op, uint32_t value)
+fbStore_r3g3b2 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint8_t *pixel = ((uint8_t *) line) + (offset >> 3);
@@ -2113,7 +2113,7 @@ IcStore_r3g3b2 (FbCompositeOperand *op, uint32_t value)
}
static void
-IcStore_b2g3r3 (FbCompositeOperand *op, uint32_t value)
+fbStore_b2g3r3 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint8_t *pixel = ((uint8_t *) line) + (offset >> 3);
@@ -2124,7 +2124,7 @@ IcStore_b2g3r3 (FbCompositeOperand *op, uint32_t value)
}
static void
-IcStore_a2r2g2b2 (FbCompositeOperand *op, uint32_t value)
+fbStore_a2r2g2b2 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint8_t *pixel = ((uint8_t *) line) + (offset >> 3);
@@ -2147,14 +2147,14 @@ IcStore_a2r2g2b2 (FbCompositeOperand *op, uint32_t value)
#endif
static void
-IcStore_a4 (FbCompositeOperand *op, uint32_t value)
+fbStore_a4 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
Store4(line,offset,value>>28);
}
static void
-IcStore_r1g2b1 (FbCompositeOperand *op, uint32_t value)
+fbStore_r1g2b1 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel;
@@ -2167,7 +2167,7 @@ IcStore_r1g2b1 (FbCompositeOperand *op, uint32_t value)
}
static void
-IcStore_b1g2r1 (FbCompositeOperand *op, uint32_t value)
+fbStore_b1g2r1 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel;
@@ -2180,7 +2180,7 @@ IcStore_b1g2r1 (FbCompositeOperand *op, uint32_t value)
}
static void
-IcStore_a1r1g1b1 (FbCompositeOperand *op, uint32_t value)
+fbStore_a1r1g1b1 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel;
@@ -2193,7 +2193,7 @@ IcStore_a1r1g1b1 (FbCompositeOperand *op, uint32_t value)
}
static void
-IcStore_a1b1g1r1 (FbCompositeOperand *op, uint32_t value)
+fbStore_a1b1g1r1 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t pixel;
@@ -2206,7 +2206,7 @@ IcStore_a1b1g1r1 (FbCompositeOperand *op, uint32_t value)
}
static void
-IcStore_a1 (FbCompositeOperand *op, uint32_t value)
+fbStore_a1 (FbCompositeOperand *op, uint32_t value)
{
FbBits *line = op->u.drawable.line; uint32_t offset = op->u.drawable.offset;
uint32_t *pixel = ((uint32_t *) line) + (offset >> 5);
@@ -2217,7 +2217,7 @@ IcStore_a1 (FbCompositeOperand *op, uint32_t value)
}
static uint32_t
-IcFetch_external (FbCompositeOperand *op)
+fbFetch_external (FbCompositeOperand *op)
{
uint32_t rgb = (*op[1].fetch) (&op[1]);
uint32_t a = (*op[2].fetch) (&op[2]);
@@ -2227,20 +2227,20 @@ IcFetch_external (FbCompositeOperand *op)
static uint32_t
-IcFetcha_external (FbCompositeOperand *op)
+fbFetcha_external (FbCompositeOperand *op)
{
return (*op[2].fetch) (&op[2]);
}
static void
-IcStore_external (FbCompositeOperand *op, uint32_t value)
+fbStore_external (FbCompositeOperand *op, uint32_t value)
{
(*op[1].store) (&op[1], value | 0xff000000);
(*op[2].store) (&op[2], value & 0xff000000);
}
static uint32_t
-IcFetch_transform (FbCompositeOperand *op)
+fbFetch_transform (FbCompositeOperand *op)
{
pixman_vector_t v;
int x, y;
@@ -2339,7 +2339,7 @@ IcFetch_transform (FbCompositeOperand *op)
}
static uint32_t
-IcFetcha_transform (FbCompositeOperand *op)
+fbFetcha_transform (FbCompositeOperand *op)
{
pixman_vector_t v;
int x, y;
@@ -2440,84 +2440,84 @@ IcFetcha_transform (FbCompositeOperand *op)
return bits;
}
-static IcAccessMap const icAccessMap[] = {
+static IcAccessMap const fbAccessMap[] = {
/* 32bpp formats */
- { PICT_a8r8g8b8, IcFetch_a8r8g8b8, IcFetch_a8r8g8b8, IcStore_a8r8g8b8 },
- { PICT_x8r8g8b8, IcFetch_x8r8g8b8, IcFetch_x8r8g8b8, IcStore_x8r8g8b8 },
- { PICT_a8b8g8r8, IcFetch_a8b8g8r8, IcFetch_a8b8g8r8, IcStore_a8b8g8r8 },
- { PICT_x8b8g8r8, IcFetch_x8b8g8r8, IcFetch_x8b8g8r8, IcStore_x8b8g8r8 },
+ { PICT_a8r8g8b8, fbFetch_a8r8g8b8, fbFetch_a8r8g8b8, fbStore_a8r8g8b8 },
+ { PICT_x8r8g8b8, fbFetch_x8r8g8b8, fbFetch_x8r8g8b8, fbStore_x8r8g8b8 },
+ { PICT_a8b8g8r8, fbFetch_a8b8g8r8, fbFetch_a8b8g8r8, fbStore_a8b8g8r8 },
+ { PICT_x8b8g8r8, fbFetch_x8b8g8r8, fbFetch_x8b8g8r8, fbStore_x8b8g8r8 },
/* 24bpp formats */
- { PICT_r8g8b8, IcFetch_r8g8b8, IcFetch_r8g8b8, IcStore_r8g8b8 },
- { PICT_b8g8r8, IcFetch_b8g8r8, IcFetch_b8g8r8, IcStore_b8g8r8 },
+ { PICT_r8g8b8, fbFetch_r8g8b8, fbFetch_r8g8b8, fbStore_r8g8b8 },
+ { PICT_b8g8r8, fbFetch_b8g8r8, fbFetch_b8g8r8, fbStore_b8g8r8 },
/* 16bpp formats */
- { PICT_r5g6b5, IcFetch_r5g6b5, IcFetch_r5g6b5, IcStore_r5g6b5 },
- { PICT_b5g6r5, IcFetch_b5g6r5, IcFetch_b5g6r5, IcStore_b5g6r5 },
-
- { PICT_a1r5g5b5, IcFetch_a1r5g5b5, IcFetch_a1r5g5b5, IcStore_a1r5g5b5 },
- { PICT_x1r5g5b5, IcFetch_x1r5g5b5, IcFetch_x1r5g5b5, IcStore_x1r5g5b5 },
- { PICT_a1b5g5r5, IcFetch_a1b5g5r5, IcFetch_a1b5g5r5, IcStore_a1b5g5r5 },
- { PICT_x1b5g5r5, IcFetch_x1b5g5r5, IcFetch_x1b5g5r5, IcStore_x1b5g5r5 },
- { PICT_a4r4g4b4, IcFetch_a4r4g4b4, IcFetch_a4r4g4b4, IcStore_a4r4g4b4 },
- { PICT_x4r4g4b4, IcFetch_x4r4g4b4, IcFetch_x4r4g4b4, IcStore_x4r4g4b4 },
- { PICT_a4b4g4r4, IcFetch_a4b4g4r4, IcFetch_a4b4g4r4, IcStore_a4b4g4r4 },
- { PICT_x4b4g4r4, IcFetch_x4b4g4r4, IcFetch_x4b4g4r4, IcStore_x4b4g4r4 },
+ { PICT_r5g6b5, fbFetch_r5g6b5, fbFetch_r5g6b5, fbStore_r5g6b5 },
+ { PICT_b5g6r5, fbFetch_b5g6r5, fbFetch_b5g6r5, fbStore_b5g6r5 },
+
+ { PICT_a1r5g5b5, fbFetch_a1r5g5b5, fbFetch_a1r5g5b5, fbStore_a1r5g5b5 },
+ { PICT_x1r5g5b5, fbFetch_x1r5g5b5, fbFetch_x1r5g5b5, fbStore_x1r5g5b5 },
+ { PICT_a1b5g5r5, fbFetch_a1b5g5r5, fbFetch_a1b5g5r5, fbStore_a1b5g5r5 },
+ { PICT_x1b5g5r5, fbFetch_x1b5g5r5, fbFetch_x1b5g5r5, fbStore_x1b5g5r5 },
+ { PICT_a4r4g4b4, fbFetch_a4r4g4b4, fbFetch_a4r4g4b4, fbStore_a4r4g4b4 },
+ { PICT_x4r4g4b4, fbFetch_x4r4g4b4, fbFetch_x4r4g4b4, fbStore_x4r4g4b4 },
+ { PICT_a4b4g4r4, fbFetch_a4b4g4r4, fbFetch_a4b4g4r4, fbStore_a4b4g4r4 },
+ { PICT_x4b4g4r4, fbFetch_x4b4g4r4, fbFetch_x4b4g4r4, fbStore_x4b4g4r4 },
/* 8bpp formats */
- { PICT_a8, IcFetch_a8, IcFetcha_a8, IcStore_a8 },
- { PICT_r3g3b2, IcFetch_r3g3b2, IcFetch_r3g3b2, IcStore_r3g3b2 },
- { PICT_b2g3r3, IcFetch_b2g3r3, IcFetch_b2g3r3, IcStore_b2g3r3 },
- { PICT_a2r2g2b2, IcFetch_a2r2g2b2, IcFetch_a2r2g2b2, IcStore_a2r2g2b2 },
+ { PICT_a8, fbFetch_a8, fbFetcha_a8, fbStore_a8 },
+ { PICT_r3g3b2, fbFetch_r3g3b2, fbFetch_r3g3b2, fbStore_r3g3b2 },
+ { PICT_b2g3r3, fbFetch_b2g3r3, fbFetch_b2g3r3, fbStore_b2g3r3 },
+ { PICT_a2r2g2b2, fbFetch_a2r2g2b2, fbFetch_a2r2g2b2, fbStore_a2r2g2b2 },
/* 4bpp formats */
- { PICT_a4, IcFetch_a4, IcFetcha_a4, IcStore_a4 },
- { PICT_r1g2b1, IcFetch_r1g2b1, IcFetch_r1g2b1, IcStore_r1g2b1 },
- { PICT_b1g2r1, IcFetch_b1g2r1, IcFetch_b1g2r1, IcStore_b1g2r1 },
- { PICT_a1r1g1b1, IcFetch_a1r1g1b1, IcFetch_a1r1g1b1, IcStore_a1r1g1b1 },
- { PICT_a1b1g1r1, IcFetch_a1b1g1r1, IcFetch_a1b1g1r1, IcStore_a1b1g1r1 },
+ { PICT_a4, fbFetch_a4, fbFetcha_a4, fbStore_a4 },
+ { PICT_r1g2b1, fbFetch_r1g2b1, fbFetch_r1g2b1, fbStore_r1g2b1 },
+ { PICT_b1g2r1, fbFetch_b1g2r1, fbFetch_b1g2r1, fbStore_b1g2r1 },
+ { PICT_a1r1g1b1, fbFetch_a1r1g1b1, fbFetch_a1r1g1b1, fbStore_a1r1g1b1 },
+ { PICT_a1b1g1r1, fbFetch_a1b1g1r1, fbFetch_a1b1g1r1, fbStore_a1b1g1r1 },
/* 1bpp formats */
- { PICT_a1, IcFetch_a1, IcFetcha_a1, IcStore_a1 },
+ { PICT_a1, fbFetch_a1, fbFetcha_a1, fbStore_a1 },
};
-#define NumAccessMap (sizeof icAccessMap / sizeof icAccessMap[0])
+#define NumAccessMap (sizeof fbAccessMap / sizeof fbAccessMap[0])
static void
-IcStepOver (FbCompositeOperand *op)
+fbStepOver (FbCompositeOperand *op)
{
op->u.drawable.offset += op->u.drawable.bpp;
}
static void
-IcStepDown (FbCompositeOperand *op)
+fbStepDown (FbCompositeOperand *op)
{
op->u.drawable.line += op->u.drawable.stride;
op->u.drawable.offset = op->u.drawable.start_offset;
}
static void
-IcSet (FbCompositeOperand *op, int x, int y)
+fbSet (FbCompositeOperand *op, int x, int y)
{
op->u.drawable.line = op->u.drawable.top_line + y * op->u.drawable.stride;
op->u.drawable.offset = op->u.drawable.left_offset + x * op->u.drawable.bpp;
}
static void
-IcStepOver_external (FbCompositeOperand *op)
+fbStepOver_external (FbCompositeOperand *op)
{
(*op[1].over) (&op[1]);
(*op[2].over) (&op[2]);
}
static void
-IcStepDown_external (FbCompositeOperand *op)
+fbStepDown_external (FbCompositeOperand *op)
{
(*op[1].down) (&op[1]);
(*op[2].down) (&op[2]);
}
static void
-IcSet_external (FbCompositeOperand *op, int x, int y)
+fbSet_external (FbCompositeOperand *op, int x, int y)
{
(*op[1].set) (&op[1], x, y);
(*op[2].set) (&op[2],
@@ -2526,20 +2526,20 @@ IcSet_external (FbCompositeOperand *op, int x, int y)
}
static void
-IcStepOver_transform (FbCompositeOperand *op)
+fbStepOver_transform (FbCompositeOperand *op)
{
op->u.transform.x++;
}
static void
-IcStepDown_transform (FbCompositeOperand *op)
+fbStepDown_transform (FbCompositeOperand *op)
{
op->u.transform.y++;
op->u.transform.x = op->u.transform.start_x;
}
static void
-IcSet_transform (FbCompositeOperand *op, int x, int y)
+fbSet_transform (FbCompositeOperand *op, int x, int y)
{
op->u.transform.x = x - op->u.transform.left_x;
op->u.transform.y = y - op->u.transform.top_y;
@@ -2547,7 +2547,7 @@ IcSet_transform (FbCompositeOperand *op, int x, int y)
int
-IcBuildCompositeOperand (pixman_image_t *image,
+fbBuildCompositeOperand (pixman_image_t *image,
FbCompositeOperand op[4],
int16_t x,
int16_t y,
@@ -2557,7 +2557,7 @@ IcBuildCompositeOperand (pixman_image_t *image,
/* Check for transform */
if (transform && image->transform)
{
- if (!IcBuildCompositeOperand (image, &op[1], 0, 0, 0, alpha))
+ if (!fbBuildCompositeOperand (image, &op[1], 0, 0, 0, alpha))
return 0;
op->u.transform.top_y = image->pixels->y;
@@ -2572,12 +2572,12 @@ IcBuildCompositeOperand (pixman_image_t *image,
op->u.transform.width = image->pixels->width;
op->u.transform.height = image->pixels->height;
- op->fetch = IcFetch_transform;
- op->fetcha = IcFetcha_transform;
+ op->fetch = fbFetch_transform;
+ op->fetcha = fbFetcha_transform;
op->store = 0;
- op->over = IcStepOver_transform;
- op->down = IcStepDown_transform;
- op->set = IcSet_transform;
+ op->over = fbStepOver_transform;
+ op->down = fbStepDown_transform;
+ op->set = fbSet_transform;
op->src_clip = op[1].src_clip;
op->dst_clip = op[1].dst_clip;
@@ -2587,9 +2587,9 @@ IcBuildCompositeOperand (pixman_image_t *image,
/* Check for external alpha */
else if (alpha && image->alphaMap)
{
- if (!IcBuildCompositeOperand (image, &op[1], x, y, 0, 0))
+ if (!fbBuildCompositeOperand (image, &op[1], x, y, 0, 0))
return 0;
- if (!IcBuildCompositeOperand (image->alphaMap, &op[2],
+ if (!fbBuildCompositeOperand (image->alphaMap, &op[2],
x - image->alphaOrigin.x,
y - image->alphaOrigin.y,
0, 0))
@@ -2597,12 +2597,12 @@ IcBuildCompositeOperand (pixman_image_t *image,
op->u.external.alpha_dx = image->alphaOrigin.x;
op->u.external.alpha_dy = image->alphaOrigin.y;
- op->fetch = IcFetch_external;
- op->fetcha = IcFetcha_external;
- op->store = IcStore_external;
- op->over = IcStepOver_external;
- op->down = IcStepDown_external;
- op->set = IcSet_external;
+ op->fetch = fbFetch_external;
+ op->fetcha = fbFetcha_external;
+ op->store = fbStore_external;
+ op->over = fbStepOver_external;
+ op->down = fbStepDown_external;
+ op->set = fbSet_external;
op->src_clip = op[1].dst_clip;
op->dst_clip = op[1].dst_clip;
@@ -2616,18 +2616,18 @@ IcBuildCompositeOperand (pixman_image_t *image,
int xoff, yoff;
for (i = 0; i < NumAccessMap; i++)
- if (icAccessMap[i].format_code == image->format_code)
+ if (fbAccessMap[i].format_code == image->format_code)
{
FbBits *bits;
IcStride stride;
int bpp;
- op->fetch = icAccessMap[i].fetch;
- op->fetcha = icAccessMap[i].fetcha;
- op->store = icAccessMap[i].store;
- op->over = IcStepOver;
- op->down = IcStepDown;
- op->set = IcSet;
+ op->fetch = fbAccessMap[i].fetch;
+ op->fetcha = fbAccessMap[i].fetcha;
+ op->store = fbAccessMap[i].store;
+ op->over = fbStepOver;
+ op->down = fbStepDown;
+ op->set = fbSet;
op->dst_clip = image->pCompositeClip;
if (image->compositeClipSource)
@@ -2685,9 +2685,9 @@ pixman_compositeGeneral (pixman_operator_t op,
IcCombineFunc f;
int w;
- if (!IcBuildCompositeOperand (iSrc, src, xSrc, ySrc, 1, 1))
+ if (!fbBuildCompositeOperand (iSrc, src, xSrc, ySrc, 1, 1))
return;
- if (!IcBuildCompositeOperand (iDst, dst, xDst, yDst, 0, 1))
+ if (!fbBuildCompositeOperand (iDst, dst, xDst, yDst, 0, 1))
return;
if (iSrc->alphaMap)
{
@@ -2709,14 +2709,14 @@ pixman_compositeGeneral (pixman_operator_t op,
dstPict = &dst[0];
dstAlpha = 0;
}
- f = IcCombineFuncU[op];
+ f = fbCombineFuncU[op];
if (iMask)
{
- if (!IcBuildCompositeOperand (iMask, msk, xMask, yMask, 1, 1))
+ if (!fbBuildCompositeOperand (iMask, msk, xMask, yMask, 1, 1))
return;
pmsk = msk;
if (iMask->componentAlpha)
- f = IcCombineFuncC[op];
+ f = fbCombineFuncC[op];
if (iMask->alphaMap)
{
mskPict = &msk[1];
diff --git a/pixman/src/icimage.h b/pixman/src/icimage.h
index b9ff070d..ef61b2be 100644
--- a/pixman/src/icimage.h
+++ b/pixman/src/icimage.h
@@ -314,7 +314,7 @@ typedef struct _IcCompSrc {
} IcCompSrc;
pixman_private int
-IcBuildCompositeOperand (pixman_image_t *image,
+fbBuildCompositeOperand (pixman_image_t *image,
FbCompositeOperand op[4],
int16_t x,
int16_t y,
diff --git a/pixman/src/icint.h b/pixman/src/icint.h
index 59a7aba4..87eb5caa 100644
--- a/pixman/src/icint.h
+++ b/pixman/src/icint.h
@@ -146,13 +146,13 @@ typedef int IcStride;
#ifdef FB_DEBUG
-extern void IcValidateDrawable(DrawablePtr d);
-extern void IcInitializeDrawable(DrawablePtr d);
-extern void IcSetBits (IcStip *bits, int stride, IcStip data);
+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)
#else
-#define IcValidateDrawable(d)
+#define fbValidateDrawable(d)
#define fdInitializeDrawable(d)
#endif
@@ -553,7 +553,7 @@ extern void IcSetBits (IcStip *bits, int stride, IcStip data);
/*
* Accelerated tiles are power of 2 width <= FB_UNIT
*/
-#define IcEvenTile(w) ((w) <= FB_UNIT && IcPowerOfTwo(w))
+#define fbEvenTile(w) ((w) <= FB_UNIT && IcPowerOfTwo(w))
/*
* Accelerated stipples are power of 2 width and <= FB_UNIT/dstBpp
* with dstBpp a power of 2 as well
@@ -564,7 +564,7 @@ extern void IcSetBits (IcStip *bits, int stride, IcStip data);
* icblt.c
*/
pixman_private void
-IcBlt (pixman_bits_t *src,
+fbBlt (pixman_bits_t *src,
IcStride srcStride,
int srcX,
@@ -583,7 +583,7 @@ IcBlt (pixman_bits_t *src,
int upsidedown);
pixman_private void
-IcBlt24 (pixman_bits_t *srcLine,
+fbBlt24 (pixman_bits_t *srcLine,
IcStride srcStride,
int srcX,
@@ -601,7 +601,7 @@ IcBlt24 (pixman_bits_t *srcLine,
int upsidedown);
pixman_private void
-IcBltStip (IcStip *src,
+fbBltStip (IcStip *src,
IcStride srcStride, /* in IcStip units, not pixman_bits_t units */
int srcX,
@@ -620,7 +620,7 @@ IcBltStip (IcStip *src,
* icbltone.c
*/
pixman_private void
-IcBltOne (IcStip *src,
+fbBltOne (IcStip *src,
IcStride srcStride,
int srcX,
pixman_bits_t *dst,
@@ -638,7 +638,7 @@ IcBltOne (IcStip *src,
#ifdef FB_24BIT
pixman_private void
-IcBltOne24 (IcStip *src,
+fbBltOne24 (IcStip *src,
IcStride srcStride, /* IcStip units per scanline */
int srcX, /* bit position of source */
pixman_bits_t *dst,
@@ -660,13 +660,13 @@ IcBltOne24 (IcStip *src,
*/
pixman_private void
-IcTransparentSpan (pixman_bits_t *dst,
+fbTransparentSpan (pixman_bits_t *dst,
pixman_bits_t stip,
pixman_bits_t fgxor,
int n);
pixman_private void
-IcEvenStipple (pixman_bits_t *dst,
+fbEvenStipple (pixman_bits_t *dst,
IcStride dstStride,
int dstX,
int dstBpp,
@@ -687,7 +687,7 @@ IcEvenStipple (pixman_bits_t *dst,
int yRot);
pixman_private void
-IcOddStipple (pixman_bits_t *dst,
+fbOddStipple (pixman_bits_t *dst,
IcStride dstStride,
int dstX,
int dstBpp,
@@ -709,7 +709,7 @@ IcOddStipple (pixman_bits_t *dst,
int yRot);
pixman_private void
-IcStipple (pixman_bits_t *dst,
+fbStipple (pixman_bits_t *dst,
IcStride dstStride,
int dstX,
int dstBpp,
@@ -758,7 +758,7 @@ typedef uint32_t Pixel;
/* icutil.c */
pixman_private pixman_bits_t
-IcReplicatePixel (Pixel p, int bpp);
+fbReplicatePixel (Pixel p, int bpp);
/* fbtrap.c */
diff --git a/pixman/src/icrop.h b/pixman/src/icrop.h
index 334bd4bd..964eb929 100644
--- a/pixman/src/icrop.h
+++ b/pixman/src/icrop.h
@@ -76,34 +76,34 @@ extern const IcMergeRopRec IcMergeRopBits[16] pixman_private;
/*
* Take a single bit (0 or 1) and generate a full mask
*/
-#define IcFillFromBit(b,t) (~((t) ((b) & 1)-1))
+#define fbFillFromBit(b,t) (~((t) ((b) & 1)-1))
-#define IcXorT(rop,fg,pm,t) ((((fg) & IcFillFromBit((rop) >> 1,t)) | \
- (~(fg) & IcFillFromBit((rop) >> 3,t))) & (pm))
+#define fbXorT(rop,fg,pm,t) ((((fg) & fbFillFromBit((rop) >> 1,t)) | \
+ (~(fg) & fbFillFromBit((rop) >> 3,t))) & (pm))
-#define IcAndT(rop,fg,pm,t) ((((fg) & IcFillFromBit (rop ^ (rop>>1),t)) | \
- (~(fg) & IcFillFromBit((rop>>2) ^ (rop>>3),t))) | \
+#define fbAndT(rop,fg,pm,t) ((((fg) & fbFillFromBit (rop ^ (rop>>1),t)) | \
+ (~(fg) & fbFillFromBit((rop>>2) ^ (rop>>3),t))) | \
~(pm))
-#define IcXor(rop,fg,pm) IcXorT(rop,fg,pm,pixman_bits_t)
+#define fbXor(rop,fg,pm) fbXorT(rop,fg,pm,pixman_bits_t)
-#define IcAnd(rop,fg,pm) IcAndT(rop,fg,pm,pixman_bits_t)
+#define fbAnd(rop,fg,pm) fbAndT(rop,fg,pm,pixman_bits_t)
-#define IcXorStip(rop,fg,pm) IcXorT(rop,fg,pm,IcStip)
+#define fbXorStip(rop,fg,pm) fbXorT(rop,fg,pm,IcStip)
-#define IcAndStip(rop,fg,pm) IcAndT(rop,fg,pm,IcStip)
+#define fbAndStip(rop,fg,pm) fbAndT(rop,fg,pm,IcStip)
/*
* Stippling operations;
*/
/* half of table */
-extern const pixman_bits_t icStipple16Bits[256] pixman_private;
-#define IcStipple16Bits(b) \
- (icStipple16Bits[(b)&0xff] | icStipple16Bits[(b) >> 8] << FB_HALFUNIT)
+extern const pixman_bits_t fbStipple16Bits[256] pixman_private;
+#define FbStipple16Bits(b) \
+ (fbStipple16Bits[(b)&0xff] | fbStipple16Bits[(b) >> 8] << FB_HALFUNIT)
pixman_private const pixman_bits_t *
-IcStippleTable(int bits);
+fbStippleTable(int bits);
#define IcStippleRRop(dst, b, fa, fx, ba, bx) \
(IcDoRRop(dst, fa, fx) & b) | (IcDoRRop(dst, ba, bx) & ~b)
diff --git a/pixman/src/icstipple.c b/pixman/src/icstipple.c
index dbde65b1..2f3776c1 100644
--- a/pixman/src/icstipple.c
+++ b/pixman/src/icstipple.c
@@ -55,7 +55,7 @@
*/
void
-IcTransparentSpan (FbBits *dst,
+fbTransparentSpan (FbBits *dst,
FbBits stip,
FbBits fgxor,
int n)
diff --git a/pixman/src/icutil.c b/pixman/src/icutil.c
index 2e04b710..a2259d0b 100644
--- a/pixman/src/icutil.c
+++ b/pixman/src/icutil.c
@@ -25,7 +25,7 @@
#include "pixman-xserver-compat.h"
pixman_bits_t
-IcReplicatePixel (Pixel p, int bpp)
+fbReplicatePixel (Pixel p, int bpp)
{
pixman_bits_t b = p;
@@ -97,22 +97,22 @@ const IcMergeRopRec IcMergeRopBits[16] = {
SelMask(b,7,w))
#if FB_UNIT == 16
-#define icStipple16Bits 0
-#define icStipple8Bits 0
-static const pixman_bits_t icStipple4Bits[16] = {
+#define fbStipple16Bits 0
+#define fbStipple8Bits 0
+static const pixman_bits_t fbStipple4Bits[16] = {
C4( 0,4), C4( 1,4), C4( 2,4), C4( 3,4), C4( 4,4), C4( 5,4),
C4( 6,4), C4( 7,4), C4( 8,4), C4( 9,4), C4( 10,4), C4( 11,4),
C4( 12,4), C4( 13,4), C4( 14,4), C4( 15,4),};
-static const pixman_bits_t icStipple2Bits[4] = {
+static const pixman_bits_t fbStipple2Bits[4] = {
C2( 0,8), C2( 1,8), C2( 2,8), C2( 3,8),
};
-static const pixman_bits_t icStipple1Bits[2] = {
+static const pixman_bits_t fbStipple1Bits[2] = {
C1( 0,16), C1( 1,16),
};
#endif
#if FB_UNIT == 32
-#define icStipple16Bits 0
-static const pixman_bits_t icStipple8Bits[256] = {
+#define fbStipple16Bits 0
+static const pixman_bits_t fbStipple8Bits[256] = {
C8( 0,4), C8( 1,4), C8( 2,4), C8( 3,4), C8( 4,4), C8( 5,4),
C8( 6,4), C8( 7,4), C8( 8,4), C8( 9,4), C8( 10,4), C8( 11,4),
C8( 12,4), C8( 13,4), C8( 14,4), C8( 15,4), C8( 16,4), C8( 17,4),
@@ -157,19 +157,19 @@ static const pixman_bits_t icStipple8Bits[256] = {
C8(246,4), C8(247,4), C8(248,4), C8(249,4), C8(250,4), C8(251,4),
C8(252,4), C8(253,4), C8(254,4), C8(255,4),
};
-static const pixman_bits_t icStipple4Bits[16] = {
+static const pixman_bits_t fbStipple4Bits[16] = {
C4( 0,8), C4( 1,8), C4( 2,8), C4( 3,8), C4( 4,8), C4( 5,8),
C4( 6,8), C4( 7,8), C4( 8,8), C4( 9,8), C4( 10,8), C4( 11,8),
C4( 12,8), C4( 13,8), C4( 14,8), C4( 15,8),};
-static const pixman_bits_t icStipple2Bits[4] = {
+static const pixman_bits_t fbStipple2Bits[4] = {
C2( 0,16), C2( 1,16), C2( 2,16), C2( 3,16),
};
-static const pixman_bits_t icStipple1Bits[2] = {
+static const pixman_bits_t fbStipple1Bits[2] = {
C1( 0,32), C1( 1,32),
};
#endif
#if FB_UNIT == 64
-const pixman_bits_t icStipple16Bits[256] = {
+const pixman_bits_t fbStipple16Bits[256] = {
C8( 0,4), C8( 1,4), C8( 2,4), C8( 3,4), C8( 4,4), C8( 5,4),
C8( 6,4), C8( 7,4), C8( 8,4), C8( 9,4), C8( 10,4), C8( 11,4),
C8( 12,4), C8( 13,4), C8( 14,4), C8( 15,4), C8( 16,4), C8( 17,4),
@@ -214,7 +214,7 @@ const pixman_bits_t icStipple16Bits[256] = {
C8(246,4), C8(247,4), C8(248,4), C8(249,4), C8(250,4), C8(251,4),
C8(252,4), C8(253,4), C8(254,4), C8(255,4),
};
-static const pixman_bits_t icStipple8Bits[256] = {
+static const pixman_bits_t fbStipple8Bits[256] = {
C8( 0,8), C8( 1,8), C8( 2,8), C8( 3,8), C8( 4,8), C8( 5,8),
C8( 6,8), C8( 7,8), C8( 8,8), C8( 9,8), C8( 10,8), C8( 11,8),
C8( 12,8), C8( 13,8), C8( 14,8), C8( 15,8), C8( 16,8), C8( 17,8),
@@ -259,28 +259,28 @@ static const pixman_bits_t icStipple8Bits[256] = {
C8(246,8), C8(247,8), C8(248,8), C8(249,8), C8(250,8), C8(251,8),
C8(252,8), C8(253,8), C8(254,8), C8(255,8),
};
-static const pixman_bits_t icStipple4Bits[16] = {
+static const pixman_bits_t fbStipple4Bits[16] = {
C4( 0,16), C4( 1,16), C4( 2,16), C4( 3,16), C4( 4,16), C4( 5,16),
C4( 6,16), C4( 7,16), C4( 8,16), C4( 9,16), C4( 10,16), C4( 11,16),
C4( 12,16), C4( 13,16), C4( 14,16), C4( 15,16),};
-static const pixman_bits_t icStipple2Bits[4] = {
+static const pixman_bits_t fbStipple2Bits[4] = {
C2( 0,32), C2( 1,32), C2( 2,32), C2( 3,32),
};
-#define icStipple1Bits 0
+#define fbStipple1Bits 0
#endif
const pixman_bits_t *
-IcStippleTable(int bits)
+fbStippleTable(int bits)
{
switch (bits) {
case 1:
- return icStipple1Bits;
+ return fbStipple1Bits;
case 2:
- return icStipple2Bits;
+ return fbStipple2Bits;
case 4:
- return icStipple4Bits;
+ return fbStipple4Bits;
case 8:
- return icStipple8Bits;
+ return fbStipple8Bits;
}
return 0;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 04:59:19 +0000