xserver: Branch 'master' - 2 commits
Eric Anholt
anholt at kemper.freedesktop.org
Mon Jul 3 22:52:33 EEST 2006
fb/fbcompose.c | 207 +++++++++++++++++++++-------------
hw/xfree86/os-support/linux/lnx_agp.c | 6
2 files changed, 136 insertions(+), 77 deletions(-)
New commits:
diff-tree 002e28c12c74aa63777f65cbfb382c2bfd0d6850 (from cf46242e337481cd3b9b39d77dd621d2a63b11f9)
Author: Eric Anholt <anholt at FreeBSD.org>
Date: Mon Jul 3 12:48:12 2006 -0700
Correct AGP memory deallocation argument on *BSD.
This fixes leaks and eventual crashes with RandR resizing on Intel.
diff --git a/hw/xfree86/os-support/linux/lnx_agp.c b/hw/xfree86/os-support/linux/lnx_agp.c
index 65a5a0e..77773f7 100644
--- a/hw/xfree86/os-support/linux/lnx_agp.c
+++ b/hw/xfree86/os-support/linux/lnx_agp.c
@@ -1,7 +1,7 @@
/*
* Abstraction of the AGP GART interface.
*
- * This version is for both Linux and FreeBSD.
+ * This version is for Linux and Free/Open/NetBSD.
*
* Copyright © 2000 VA Linux Systems, Inc.
* Copyright © 2001 The XFree86 Project, Inc.
@@ -264,7 +264,11 @@ xf86DeallocateGARTMemory(int screenNum,
return FALSE;
}
+#ifdef __linux__
if (ioctl(gartFd, AGPIOC_DEALLOCATE, (int *)key) != 0) {
+#else
+ if (ioctl(gartFd, AGPIOC_DEALLOCATE, &key) != 0) {
+#endif
xf86DrvMsg(screenNum, X_WARNING,"xf86DeAllocateGARTMemory: "
"deallocation gart memory with key %d failed\n\t(%s)\n",
key, strerror(errno));
diff-tree cf46242e337481cd3b9b39d77dd621d2a63b11f9 (from a838fb70c52a829872680f6a2a2e7dd6d2dc9247)
Author: Eric Anholt <anholt at FreeBSD.org>
Date: Wed Jun 28 18:35:59 2006 +0200
Optimize out computing a gradient pixel if the mask value is 0.
Obtained from: kdrive CVS (DavidR XGL fb/ megapatch)
diff --git a/fb/fbcompose.c b/fb/fbcompose.c
index 3a61e97..7e17a01 100644
--- a/fb/fbcompose.c
+++ b/fb/fbcompose.c
@@ -2635,7 +2635,8 @@ FbComposeFunctions composeFunctions = {
};
-static void fbFetchSolid(PicturePtr pict, int x, int y, int width, CARD32 *buffer)
+static void fbFetchSolid(PicturePtr pict, int x, int y, int width,
+ CARD32 *buffer, CARD32 *mask, CARD32 maskBits)
{
FbBits *bits;
FbStride stride;
@@ -2656,7 +2657,8 @@ static void fbFetchSolid(PicturePtr pict
*buffer++ = color;
}
-static void fbFetch(PicturePtr pict, int x, int y, int width, CARD32 *buffer)
+static void fbFetch(PicturePtr pict, int x, int y, int width, CARD32 *buffer,
+ CARD32 *mask, CARD32 maskBits)
{
FbBits *bits;
FbStride stride;
@@ -2711,7 +2713,8 @@ static CARD32 gradientPixel(const Source
return pGradient->linear.colorTable[ipos];
}
-static void fbFetchSourcePict(PicturePtr pict, int x, int y, int width, CARD32 *buffer)
+static void fbFetchSourcePict(PicturePtr pict, int x, int y, int width,
+ CARD32 *buffer, CARD32 *mask, CARD32 maskBits)
{
SourcePictPtr pGradient = pict->pSourcePict;
CARD32 *end = buffer + width;
@@ -2761,22 +2764,30 @@ static void fbFetchSourcePict(PicturePtr
inc = (a * unit.vector[0] + b * unit.vector[1]) >> 16;
}
while (buffer < end) {
- *buffer++ = gradientPixel(pGradient, t, pict->repeatType);
+ if (mask == NULL || (*mask++ & maskBits) != 0) {
+ *buffer++ = gradientPixel(pGradient, t, pict->repeatType);
+ } else {
+ *buffer++ = 0; /* Set it to a value for valgrind */
+ }
t += inc;
}
} else {
/* projective transformation */
while (buffer < end) {
- xFixed_48_16 t;
- if (v.vector[2] == 0) {
- t = 0;
- } else {
- xFixed_48_16 x, y;
- x = ((xFixed_48_16)v.vector[0] << 16) / v.vector[2];
- y = ((xFixed_48_16)v.vector[1] << 16) / v.vector[2];
- t = ((a*x + b*y) >> 16) + off;
- }
- *buffer++ = gradientPixel(pGradient, t, pict->repeatType);
+ if (mask == NULL || (*mask++ & maskBits) != 0) {
+ xFixed_48_16 t;
+ if (v.vector[2] == 0) {
+ t = 0;
+ } else {
+ xFixed_48_16 x, y;
+ x = ((xFixed_48_16)v.vector[0] << 16) / v.vector[2];
+ y = ((xFixed_48_16)v.vector[1] << 16) / v.vector[2];
+ t = ((a*x + b*y) >> 16) + off;
+ }
+ *buffer++ = gradientPixel(pGradient, t, pict->repeatType);
+ } else {
+ *buffer++ = 0; /* Set it to a value for valgrind */
+ }
v.vector[0] += unit.vector[0];
v.vector[1] += unit.vector[1];
v.vector[2] += unit.vector[2];
@@ -2816,37 +2827,45 @@ static void fbFetchSourcePict(PicturePtr
ry -= pGradient->radial.fy;
while (buffer < end) {
- double b = 2*(rx*pGradient->radial.dx + ry*pGradient->radial.dy);
- double c = -(rx*rx + ry*ry);
- double det = (b * b) - (4 * pGradient->radial.a * c);
- double s = (-b + sqrt(det))/(2. * pGradient->radial.a);
- *buffer = gradientPixel(pGradient,
- (xFixed_48_16)((s*pGradient->radial.m + pGradient->radial.b)*65536),
- pict->repeatType);
- ++buffer;
+ if (mask == NULL || (*mask++ & maskBits) != 0) {
+ double b = 2*(rx*pGradient->radial.dx + ry*pGradient->radial.dy);
+ double c = -(rx*rx + ry*ry);
+ double det = (b * b) - (4 * pGradient->radial.a * c);
+ double s = (-b + sqrt(det))/(2. * pGradient->radial.a);
+ *buffer++ = gradientPixel(pGradient,
+ (xFixed_48_16)((s * pGradient->radial.m +
+ pGradient->radial.b) * 65536),
+ pict->repeatType);
+ } else {
+ *buffer++ = 0;
+ }
rx += cx;
ry += cy;
}
} else {
while (buffer < end) {
- double x, y;
- double b, c, det, s;
- if (rz != 0) {
- x = rx/rz;
- y = ry/rz;
- } else {
- x = y = 0.;
- }
- x -= pGradient->radial.fx;
- y -= pGradient->radial.fy;
- b = 2*(x*pGradient->radial.dx + y*pGradient->radial.dy);
- c = -(x*x + y*y);
- det = (b * b) - (4 * pGradient->radial.a * c);
- s = (-b + sqrt(det))/(2. * pGradient->radial.a);
- *buffer = gradientPixel(pGradient,
- (xFixed_48_16)((s*pGradient->radial.m + pGradient->radial.b)*65536),
- pict->repeatType);
- ++buffer;
+ if (mask == NULL || (*mask++ & maskBits) != 0) {
+ double x, y;
+ double b, c, det, s;
+ if (rz != 0) {
+ x = rx/rz;
+ y = ry/rz;
+ } else {
+ x = y = 0.;
+ }
+ x -= pGradient->radial.fx;
+ y -= pGradient->radial.fy;
+ b = 2*(x*pGradient->radial.dx + y*pGradient->radial.dy);
+ c = -(x*x + y*y);
+ det = (b * b) - (4 * pGradient->radial.a * c);
+ s = (-b + sqrt(det))/(2. * pGradient->radial.a);
+ *buffer++ = gradientPixel(pGradient,
+ (xFixed_48_16)((s * pGradient->radial.m +
+ pGradient->radial.b) * 65536),
+ pict->repeatType);
+ } else {
+ *buffer++ = 0;
+ }
rx += cx;
ry += cy;
rz += cz;
@@ -2859,29 +2878,37 @@ static void fbFetchSourcePict(PicturePtr
ry -= pGradient->conical.center.y/65536.;
while (buffer < end) {
- double angle = atan2(ry, rx) + a;
- *buffer = gradientPixel(pGradient, (xFixed_48_16) (angle * (65536. / (2*M_PI))),
- pict->repeatType);
- ++buffer;
+ if (mask == NULL || (*mask++ & maskBits) != 0) {
+ double angle = atan2(ry, rx) + a;
+ *buffer++ = gradientPixel(pGradient,
+ (xFixed_48_16) (angle * (65536. / (2*M_PI))),
+ pict->repeatType);
+ } else {
+ *buffer++ = 0;
+ }
rx += cx;
ry += cy;
}
} else {
while (buffer < end) {
- double x, y, angle;
- if (rz != 0) {
- x = rx/rz;
- y = ry/rz;
- } else {
- x = y = 0.;
- }
- x -= pGradient->conical.center.x/65536.;
- y -= pGradient->conical.center.y/65536.;
- angle = atan2(y, x) + a;
- *buffer = gradientPixel(pGradient, (xFixed_48_16) (angle * (65536. / (2*M_PI))),
- pict->repeatType);
- ++buffer;
+ if (mask == NULL || (*mask++ & maskBits) != 0) {
+ double x, y, angle;
+ if (rz != 0) {
+ x = rx/rz;
+ y = ry/rz;
+ } else {
+ x = y = 0.;
+ }
+ x -= pGradient->conical.center.x/65536.;
+ y -= pGradient->conical.center.y/65536.;
+ angle = atan2(y, x) + a;
+ *buffer++ = gradientPixel(pGradient, (xFixed_48_16)
+ (angle * (65536. / (2*M_PI))),
+ pict->repeatType);
+ } else {
+ *buffer++ = 0;
+ }
rx += cx;
ry += cy;
rz += cz;
@@ -2893,7 +2920,8 @@ static void fbFetchSourcePict(PicturePtr
-static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32 *buffer)
+static void fbFetchTransformed(PicturePtr pict, int x, int y, int width,
+ CARD32 *buffer, CARD32 *mask, CARD32 maskBits)
{
FbBits *bits;
FbStride stride;
@@ -3357,21 +3385,24 @@ static void fbFetchTransformed(PicturePt
}
-static void fbFetchExternalAlpha(PicturePtr pict, int x, int y, int width, CARD32 *buffer)
+static void fbFetchExternalAlpha(PicturePtr pict, int x, int y, int width,
+ CARD32 *buffer, CARD32 *mask, CARD32 maskBits)
{
int i;
CARD32 _alpha_buffer[SCANLINE_BUFFER_LENGTH];
CARD32 *alpha_buffer = _alpha_buffer;
if (!pict->alphaMap) {
- fbFetchTransformed(pict, x, y, width, buffer);
+ fbFetchTransformed(pict, x, y, width, buffer, mask, maskBits);
return;
}
if (width > SCANLINE_BUFFER_LENGTH)
alpha_buffer = (CARD32 *) malloc(width*sizeof(CARD32));
- fbFetchTransformed(pict, x, y, width, buffer);
- fbFetchTransformed(pict->alphaMap, x - pict->alphaOrigin.x, y - pict->alphaOrigin.y, width, alpha_buffer);
+ fbFetchTransformed(pict, x, y, width, buffer, mask, maskBits);
+ fbFetchTransformed(pict->alphaMap, x - pict->alphaOrigin.x,
+ y - pict->alphaOrigin.y, width, alpha_buffer,
+ mask, maskBits);
for (i = 0; i < width; ++i) {
int a = alpha_buffer[i]>>24;
buffer[i] = (a << 24)
@@ -3441,7 +3472,8 @@ static void fbStoreExternalAlpha(Picture
}
typedef void (*scanStoreProc)(PicturePtr , int , int , int , CARD32 *);
-typedef void (*scanFetchProc)(PicturePtr , int , int , int , CARD32 *);
+typedef void (*scanFetchProc)(PicturePtr , int , int , int , CARD32 *,
+ CARD32 *, CARD32);
static void
fbCompositeRect (const FbComposeData *data, CARD32 *scanline_buffer)
@@ -3503,12 +3535,16 @@ fbCompositeRect (const FbComposeData *da
for (i = 0; i < data->height; ++i)
{
/* fill first half of scanline with source */
- fetchSrc(data->src, data->xSrc, data->ySrc + i, data->width, src_buffer);
- fetchMask(data->mask, data->xMask, data->yMask + i, data->width, mask_buffer);
+ fetchMask(data->mask, data->xMask, data->yMask + i, data->width,
+ mask_buffer, NULL, 0);
+ fetchSrc(data->src, data->xSrc, data->ySrc + i, data->width,
+ src_buffer, mask_buffer, 0);
/* fill dest into second half of scanline */
- if (fetchDest)
- fetchDest(data->dest, data->xDest, data->yDest + i, data->width, dest_buffer);
+ if (fetchDest) {
+ fetchDest(data->dest, data->xDest, data->yDest + i, data->width,
+ dest_buffer, NULL, 0);
+ }
/* blend */
compose(dest_buffer, src_buffer, mask_buffer, data->width);
@@ -3517,17 +3553,27 @@ fbCompositeRect (const FbComposeData *da
store(data->dest, data->xDest, data->yDest + i, data->width, dest_buffer);
}
} else {
-
+ CARD32 *mask_buffer;
CombineFuncU compose = composeFunctions.combineU[data->op];
if (!compose)
return;
+ if (fetchMask)
+ mask_buffer = dest_buffer + data->width;
+ else
+ mask_buffer = NULL;
+
if (fetchSrc == fbFetchSolid && (!fetchMask || fetchMask == fbFetchSolid)) {
- fetchSrc(data->src, data->xSrc, data->ySrc, data->width, src_buffer);
if (fetchMask) {
- fetchMask(data->mask, data->xMask, data->yMask, data->width, dest_buffer);
- composeFunctions.combineMaskU(src_buffer, dest_buffer, data->width);
+ fetchMask(data->mask, data->xMask, data->yMask, data->width,
+ dest_buffer, NULL, 0);
}
+ fetchSrc(data->src, data->xSrc, data->ySrc, data->width,
+ src_buffer, mask_buffer, 0xff000000);
+ if (mask_buffer != NULL) {
+ composeFunctions.combineMaskU(src_buffer, dest_buffer,
+ data->width);
+ }
fetchSrc = NULL;
fetchMask = NULL;
}
@@ -3536,18 +3582,27 @@ fbCompositeRect (const FbComposeData *da
{
/* fill first half of scanline with source */
if (fetchSrc) {
- fetchSrc(data->src, data->xSrc, data->ySrc + i, data->width, src_buffer);
+ /* Fetch mask before source so that fetching of source can be
+ * optimized out if possible.
+ */
+ if (fetchMask) {
+ fetchMask(data->mask, data->xMask, data->yMask + i,
+ data->width, dest_buffer, NULL, 0);
+ }
+ fetchSrc(data->src, data->xSrc, data->ySrc + i, data->width,
+ src_buffer, mask_buffer, 0xff000000);
/* add in mask */
- if (fetchMask) {
- fetchMask(data->mask, data->xMask, data->yMask + i, data->width, dest_buffer);
+ if (mask_buffer != NULL) {
composeFunctions.combineMaskU(src_buffer, dest_buffer, data->width);
}
}
/* fill dest into second half of scanline */
- if (fetchDest)
- fetchDest(data->dest, data->xDest, data->yDest + i, data->width, dest_buffer);
+ if (fetchDest != NULL) {
+ fetchDest(data->dest, data->xDest, data->yDest + i, data->width,
+ dest_buffer, NULL, 0);
+ }
/* blend */
compose(dest_buffer, src_buffer, data->width);
More information about the xorg-commit
mailing list