frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix handling of "super luminescent" colors Fix off by one error in the 

transformation handling.
This commit is contained in:
Lars Knoll 2005-07-04 14:23:59 +00:00
parent e34f31762e
commit a4df8ad755
2 changed files with 349 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
fb/fbcompose.c
View File

@ -1471,8 +1471,8 @@ fbCombineOverU (CARD32 *dest, const CARD32 *src, int width)
CARD32 d = dest[i]; CARD32 d = dest[i];
CARD32 ia = Alpha(~s); CARD32 ia = Alpha(~s);
FbByteMul(d, ia); FbByteMulAdd(d, ia, s);
dest[i] = s + d; dest[i] = d;
} }
} }
@ -1482,9 +1482,10 @@ fbCombineOverReverseU (CARD32 *dest, const CARD32 *src, int width)
int i; int i;
for (i = 0; i < width; ++i) { for (i = 0; i < width; ++i) {
CARD32 s = src[i]; CARD32 s = src[i];
CARD32 d = dest[i];
CARD32 ia = Alpha(~dest[i]); CARD32 ia = Alpha(~dest[i]);
FbByteMul(s, ia); FbByteMulAdd(s, ia, d);
dest[i] += s; dest[i] = s;
} }
} }
@ -1743,8 +1744,8 @@ fbCombineDisjointOverU (CARD32 *dest, const CARD32 *src, int width)
{ {
CARD32 d = dest[i]; CARD32 d = dest[i];
a = fbCombineDisjointOutPart (d >> 24, a); a = fbCombineDisjointOutPart (d >> 24, a);
FbByteMul(d, a); FbByteMulAdd(d, a, s);
s += d; s = d;
} }
dest[i] = s; dest[i] = s;
} }
@ -2089,8 +2090,8 @@ fbCombineOverC (CARD32 *dest, CARD32 *src, CARD32 *mask, int width)
if (a) if (a)
{ {
CARD32 d = dest[i]; CARD32 d = dest[i];
FbByteMulC(d, a); FbByteMulAddC(d, a, s);
s += d; s = d;
} }
dest[i] = s; dest[i] = s;
} }
@ -2111,8 +2112,7 @@ fbCombineOverReverseC (CARD32 *dest, CARD32 *src, CARD32 *mask, int width)
CARD32 s = src[i]; CARD32 s = src[i];
if (a != 0xff) if (a != 0xff)
{ {
FbByteMul(s, a); FbByteMulAdd(s, a, d);
d += s;
} }
dest[i] = s; dest[i] = s;
} }
@ -2894,26 +2894,22 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32
if (REGION_NUM_RECTS(pict->pCompositeClip) == 1) { if (REGION_NUM_RECTS(pict->pCompositeClip) == 1) {
box = pict->pCompositeClip->extents; box = pict->pCompositeClip->extents;
for (i = 0; i < width; ++i) { for (i = 0; i < width; ++i) {
v.vector[0] += unit.vector[0];
v.vector[1] += unit.vector[1];
v.vector[2] += unit.vector[2];
if (!v.vector[2]) { if (!v.vector[2]) {
buffer[i] = 0; buffer[i] = 0;
continue; } else {
}
y = MOD((v.vector[1]/v.vector[2]), pict->pDrawable->height); y = MOD((v.vector[1]/v.vector[2]), pict->pDrawable->height);
x = MOD((v.vector[0]/v.vector[2]), pict->pDrawable->width); x = MOD((v.vector[0]/v.vector[2]), pict->pDrawable->width);
buffer[i] = fetch(bits + (y + pict->pDrawable->y)*stride, x + pict->pDrawable->x, indexed); buffer[i] = fetch(bits + (y + pict->pDrawable->y)*stride, x + pict->pDrawable->x, indexed);
} }
} else {
for (i = 0; i < width; ++i) {
v.vector[0] += unit.vector[0]; v.vector[0] += unit.vector[0];
v.vector[1] += unit.vector[1]; v.vector[1] += unit.vector[1];
v.vector[2] += unit.vector[2]; v.vector[2] += unit.vector[2];
}
} else {
for (i = 0; i < width; ++i) {
if (!v.vector[2]) { if (!v.vector[2]) {
buffer[i] = 0; buffer[i] = 0;
continue; } else {
}
y = MOD((v.vector[1]/v.vector[2]), pict->pDrawable->height); y = MOD((v.vector[1]/v.vector[2]), pict->pDrawable->height);
x = MOD((v.vector[0]/v.vector[2]), pict->pDrawable->width); x = MOD((v.vector[0]/v.vector[2]), pict->pDrawable->width);
if (POINT_IN_REGION (0, pict->pCompositeClip, x, y, &box)) if (POINT_IN_REGION (0, pict->pCompositeClip, x, y, &box))
@ -2921,32 +2917,32 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32
else else
buffer[i] = 0; buffer[i] = 0;
} }
v.vector[0] += unit.vector[0];
v.vector[1] += unit.vector[1];
v.vector[2] += unit.vector[2];
}
} }
} else { } else {
if (REGION_NUM_RECTS(pict->pCompositeClip) == 1) { if (REGION_NUM_RECTS(pict->pCompositeClip) == 1) {
box = pict->pCompositeClip->extents; box = pict->pCompositeClip->extents;
for (i = 0; i < width; ++i) { for (i = 0; i < width; ++i) {
v.vector[0] += unit.vector[0];
v.vector[1] += unit.vector[1];
v.vector[2] += unit.vector[2];
if (!v.vector[2]) { if (!v.vector[2]) {
buffer[i] = 0; buffer[i] = 0;
continue; } else {
}
y = (v.vector[1]/v.vector[2]); y = (v.vector[1]/v.vector[2]);
x = (v.vector[0]/v.vector[2]); x = (v.vector[0]/v.vector[2]);
buffer[i] = ((x < box.x1) | (x >= box.x2) | (y < box.y1) | (y >= box.y2)) ? buffer[i] = ((x < box.x1) | (x >= box.x2) | (y < box.y1) | (y >= box.y2)) ?
0 : fetch(bits + (y + pict->pDrawable->y)*stride, x + pict->pDrawable->x, indexed); 0 : fetch(bits + (y + pict->pDrawable->y)*stride, x + pict->pDrawable->x, indexed);
} }
} else {
for (i = 0; i < width; ++i) {
v.vector[0] += unit.vector[0]; v.vector[0] += unit.vector[0];
v.vector[1] += unit.vector[1]; v.vector[1] += unit.vector[1];
v.vector[2] += unit.vector[2]; v.vector[2] += unit.vector[2];
}
} else {
for (i = 0; i < width; ++i) {
if (!v.vector[2]) { if (!v.vector[2]) {
buffer[i] = 0; buffer[i] = 0;
continue; } else {
}
y = (v.vector[1]/v.vector[2]); y = (v.vector[1]/v.vector[2]);
x = (v.vector[0]/v.vector[2]); x = (v.vector[0]/v.vector[2]);
if (POINT_IN_REGION (0, pict->pCompositeClip, x, y, &box)) if (POINT_IN_REGION (0, pict->pCompositeClip, x, y, &box))
@ -2954,6 +2950,10 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32
else else
buffer[i] = 0; buffer[i] = 0;
} }
v.vector[0] += unit.vector[0];
v.vector[1] += unit.vector[1];
v.vector[2] += unit.vector[2];
}
} }
} }
} else if (pict->filter == PictFilterBilinear) { } else if (pict->filter == PictFilterBilinear) {
@ -2961,19 +2961,14 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32
if (REGION_NUM_RECTS(pict->pCompositeClip) == 1) { if (REGION_NUM_RECTS(pict->pCompositeClip) == 1) {
box = pict->pCompositeClip->extents; box = pict->pCompositeClip->extents;
for (i = 0; i < width; ++i) { for (i = 0; i < width; ++i) {
if (!v.vector[2]) {
buffer[i] = 0;
} else {
int x1, x2, y1, y2, distx, idistx, disty, idisty; int x1, x2, y1, y2, distx, idistx, disty, idisty;
FbBits *b; FbBits *b;
CARD32 tl, tr, bl, br; CARD32 tl, tr, bl, br;
xFixed_48_16 div; xFixed_48_16 div;
v.vector[0] += unit.vector[0];
v.vector[1] += unit.vector[1];
v.vector[2] += unit.vector[2];
if (!v.vector[2]) {
buffer[i] = 0;
continue;
}
div = ((xFixed_48_16)v.vector[0] << 16)/v.vector[2]; div = ((xFixed_48_16)v.vector[0] << 16)/v.vector[2];
x1 = div >> 16; x1 = div >> 16;
distx = ((xFixed)div >> 8) & 0xff; distx = ((xFixed)div >> 8) & 0xff;
@ -3004,21 +2999,20 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32
FbByteAddMul_256(tl, idisty, bl, disty); FbByteAddMul_256(tl, idisty, bl, disty);
buffer[i] = tl; buffer[i] = tl;
} }
v.vector[0] += unit.vector[0];
v.vector[1] += unit.vector[1];
v.vector[2] += unit.vector[2];
}
} else { } else {
for (i = 0; i < width; ++i) { for (i = 0; i < width; ++i) {
if (!v.vector[2]) {
buffer[i] = 0;
} else {
int x1, x2, y1, y2, distx, idistx, disty, idisty; int x1, x2, y1, y2, distx, idistx, disty, idisty;
FbBits *b; FbBits *b;
CARD32 tl, tr, bl, br; CARD32 tl, tr, bl, br;
xFixed_48_16 div; xFixed_48_16 div;
v.vector[0] += unit.vector[0];
v.vector[1] += unit.vector[1];
v.vector[2] += unit.vector[2];
if (!v.vector[2]) {
buffer[i] = 0;
continue;
}
div = ((xFixed_48_16)v.vector[0] << 16)/v.vector[2]; div = ((xFixed_48_16)v.vector[0] << 16)/v.vector[2];
x1 = div >> 16; x1 = div >> 16;
distx = ((xFixed)div >> 8) & 0xff; distx = ((xFixed)div >> 8) & 0xff;
@ -3053,25 +3047,24 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32
FbByteAddMul_256(tl, idisty, bl, disty); FbByteAddMul_256(tl, idisty, bl, disty);
buffer[i] = tl; buffer[i] = tl;
} }
v.vector[0] += unit.vector[0];
v.vector[1] += unit.vector[1];
v.vector[2] += unit.vector[2];
}
} }
} else { } else {
if (REGION_NUM_RECTS(pict->pCompositeClip) == 1) { if (REGION_NUM_RECTS(pict->pCompositeClip) == 1) {
box = pict->pCompositeClip->extents; box = pict->pCompositeClip->extents;
for (i = 0; i < width; ++i) { for (i = 0; i < width; ++i) {
if (!v.vector[2]) {
buffer[i] = 0;
} else {
int x1, x2, y1, y2, distx, idistx, disty, idisty, x_off; int x1, x2, y1, y2, distx, idistx, disty, idisty, x_off;
FbBits *b; FbBits *b;
CARD32 tl, tr, bl, br; CARD32 tl, tr, bl, br;
Bool x1_out, x2_out, y1_out, y2_out; Bool x1_out, x2_out, y1_out, y2_out;
xFixed_48_16 div; xFixed_48_16 div;
v.vector[0] += unit.vector[0];
v.vector[1] += unit.vector[1];
v.vector[2] += unit.vector[2];
if (!v.vector[2]) {
buffer[i] = 0;
continue;
}
div = ((xFixed_48_16)v.vector[0] << 16)/v.vector[2]; div = ((xFixed_48_16)v.vector[0] << 16)/v.vector[2];
x1 = div >> 16; x1 = div >> 16;
distx = ((xFixed)div >> 8) & 0xff; distx = ((xFixed)div >> 8) & 0xff;
@ -3103,21 +3096,20 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32
FbByteAddMul_256(tl, idisty, bl, disty); FbByteAddMul_256(tl, idisty, bl, disty);
buffer[i] = tl; buffer[i] = tl;
} }
v.vector[0] += unit.vector[0];
v.vector[1] += unit.vector[1];
v.vector[2] += unit.vector[2];
}
} else { } else {
for (i = 0; i < width; ++i) { for (i = 0; i < width; ++i) {
if (!v.vector[2]) {
buffer[i] = 0;
} else {
int x1, x2, y1, y2, distx, idistx, disty, idisty, x_off; int x1, x2, y1, y2, distx, idistx, disty, idisty, x_off;
FbBits *b; FbBits *b;
CARD32 tl, tr, bl, br; CARD32 tl, tr, bl, br;
xFixed_48_16 div; xFixed_48_16 div;
v.vector[0] += unit.vector[0];
v.vector[1] += unit.vector[1];
v.vector[2] += unit.vector[2];
if (!v.vector[2]) {
buffer[i] = 0;
continue;
}
div = ((xFixed_48_16)v.vector[0] << 16)/v.vector[2]; div = ((xFixed_48_16)v.vector[0] << 16)/v.vector[2];
x1 = div >> 16; x1 = div >> 16;
distx = ((xFixed)div >> 8) & 0xff; distx = ((xFixed)div >> 8) & 0xff;
@ -3148,6 +3140,10 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32
FbByteAddMul_256(tl, idisty, bl, disty); FbByteAddMul_256(tl, idisty, bl, disty);
buffer[i] = tl; buffer[i] = tl;
} }
v.vector[0] += unit.vector[0];
v.vector[1] += unit.vector[1];
v.vector[2] += unit.vector[2];
}
} }
} }
} else if (pict->filter == PictFilterConvolution) { } else if (pict->filter == PictFilterConvolution) {
@ -3158,19 +3154,13 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32
int yoff = params[1] >> 1; int yoff = params[1] >> 1;
params += 2; params += 2;
for (i = 0; i < width; ++i) { for (i = 0; i < width; ++i) {
if (!v.vector[2]) {
buffer[i] = 0;
} else {
int x1, x2, y1, y2, x, y; int x1, x2, y1, y2, x, y;
INT32 srtot, sgtot, sbtot, satot; INT32 srtot, sgtot, sbtot, satot;
xFixed *p = params; xFixed *p = params;
xFixed_48_16 tmp; xFixed_48_16 tmp;
v.vector[0] += unit.vector[0];
v.vector[1] += unit.vector[1];
v.vector[2] += unit.vector[2];
if (!v.vector[2]) {
buffer[i] = 0;
continue;
}
tmp = ((xFixed_48_16)v.vector[0] << 16)/v.vector[2] - xoff; tmp = ((xFixed_48_16)v.vector[0] << 16)/v.vector[2] - xoff;
x1 = xFixedToInt(tmp); x1 = xFixedToInt(tmp);
x2 = x1 + cwidth; x2 = x1 + cwidth;
@ -3209,6 +3199,10 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32
(sgtot << 8) | (sgtot << 8) |
(sbtot )); (sbtot ));
} }
v.vector[0] += unit.vector[0];
v.vector[1] += unit.vector[1];
v.vector[2] += unit.vector[2];
}
} }
} }

99
fb/fbpict.h
View File

@ -158,18 +158,56 @@
x += t; \ x += t; \
} while (0) } while (0)
/*
x_c = (x_c * a) / 255 + y
*/
#define FbByteMulAdd(x, a, y) do { \
CARD32 t = (x & 0xff00ff) * a; \
t = (t + ((t >> 8) & 0xff00ff) + 0x800080) >> 8; \
t &= 0xff00ff; \
t += y & 0xff00ff; \
t |= 0x1000100 - ((t >> 8) & 0xff00ff); \
t &= 0xff00ff; \
\
x = ((x >> 8) & 0xff00ff) * a; \
x = (x + ((x >> 8) & 0xff00ff) + 0x800080) >> 8; \
x &= 0xff00ff; \
x += (y >> 8) & 0xff00ff; \
x |= 0x1000100 - ((t >> 8) & 0xff00ff); \
x &= 0xff00ff; \
x <<= 8; \
x += t; \
} while (0)
/* /*
x_c = (x_c * a + y_c * b) / 255 x_c = (x_c * a + y_c * b) / 255
*/ */
#define FbByteAddMul(x, a, y, b) do { \ #define FbByteAddMul(x, a, y, b) do { \
CARD32 t = (x & 0xff00ff) * a + (y & 0xff00ff) * b; \ CARD32 t; \
t = (t + ((t >> 8) & 0xff00ff) + 0x800080) >> 8; \ CARD32 r = (x >> 24) * a + (y >> 24) * b; \
t &= 0xff00ff; \ r += (r >> 8) + 0x80; \
r >>= 8; \
\ \
x = ((x >> 8) & 0xff00ff) * a + ((y >> 8) & 0xff00ff) * b; \ t = (x & 0xff00) * a + (y & 0xff00) * b; \
x = (x + ((x >> 8) & 0xff00ff) + 0x800080); \ t += (t >> 8) + 0x8000; \
x &= 0xff00ff00; \ t >>= 16; \
x += t; \ \
t |= r << 16; \
t |= 0x1000100 - ((t >> 8) & 0xff00ff); \
t &= 0xff00ff; \
t <<= 8; \
\
r = ((x >> 16) & 0xff) * a + ((y >> 16) & 0xff) * b; \
r += (r >> 8) + 0x80; \
r >>= 8; \
\
x = (x & 0xff) * a + (y & 0xff) * b; \
x += (x >> 8) + 0x80; \
x >>= 8; \
x |= r << 16; \
x |= 0x1000100 - ((x >> 8) & 0xff00ff); \
x &= 0xff00ff; \
x |= t; \
} while (0) } while (0)
/* /*
@ -203,23 +241,58 @@
} while (0) } while (0)
/* /*
x_c = (x_c * a_c + y_c * b) / 255 x_c = (x_c * a) / 255 + y
*/ */
#define FbByteAddMulC(x, a, y, b) do { \ #define FbByteMulAddC(x, a, y) do { \
CARD32 t; \ CARD32 t; \
CARD32 r = (x & 0xff) * (a & 0xff); \ CARD32 r = (x & 0xff) * (a & 0xff); \
r |= (x & 0xff0000) * ((a >> 16) & 0xff); \ r |= (x & 0xff0000) * ((a >> 16) & 0xff); \
r += (y & 0xff00ff) * b; \
r = (r + ((r >> 8) & 0xff00ff) + 0x800080) >> 8; \ r = (r + ((r >> 8) & 0xff00ff) + 0x800080) >> 8; \
r &= 0xff00ff; \
r += y & 0xff00ff; \
r |= 0x1000100 - ((r >> 8) & 0xff00ff); \
r &= 0xff00ff; \ r &= 0xff00ff; \
\ \
x >>= 8; \ x >>= 8; \
t = (x & 0xff) * ((a >> 8) & 0xff); \ t = (x & 0xff) * ((a >> 8) & 0xff); \
t |= (x & 0xff0000) * (a >> 24); \ t |= (x & 0xff0000) * (a >> 24); \
t += ((y >> 8) & 0xff00ff) * b; \ t = (t + ((t >> 8) & 0xff00ff) + 0x800080) >> 8; \
t = (t + ((t >> 8) & 0xff00ff) + 0x800080); \ t &= 0xff00ff; \
x = r | (t & 0xff00ff00); \ t += (y >> 8) & 0xff00ff; \
t |= 0x1000100 - ((t >> 8) & 0xff00ff); \
t &= 0xff00ff; \
x = r | (t << 8); \
} while (0)
/*
x_c = (x_c * a_c + y_c * b) / 255
*/
#define FbByteAddMulC(x, a, y, b) do { \
CARD32 t; \
CARD32 r = (x >> 24) * (a >> 24) + (y >> 24) * b; \
r += (r >> 8) + 0x80; \
r >>= 8; \
\ \
t = (x & 0xff00) * ((a >> 8) & 0xff) + (y & 0xff00) * b; \
t += (t >> 8) + 0x8000; \
t >>= 16; \
\
t |= r << 16; \
t |= 0x1000100 - ((t >> 8) & 0xff00ff); \
t &= 0xff00ff; \
t <<= 8; \
\
r = ((x >> 16) & 0xff) * ((a >> 16) & 0xff) + ((y >> 16) & 0xff) * b; \
r += (r >> 8) + 0x80; \
r >>= 8; \
\
x = (x & 0xff) * (a & 0xff) + (y & 0xff) * b; \
x += (x >> 8) + 0x80; \
x >>= 8; \
x |= r << 16; \
x |= 0x1000100 - ((x >> 8) & 0xff00ff); \
x &= 0xff00ff; \
x |= t; \
} while (0) } while (0)
/* /*