diff options
| author | Eric Anholt <anholt@freebsd.org> | 2005-10-02 08:28:27 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2005-10-02 08:28:27 +0000 |
| commit | ecaa46380ed0a920186407b9294c5c60f75f1a13 (patch) | |
| tree | 756b32993f2e0e3ccf2a221d4b686e52387069fc /fb/fbpoint.c | |
| parent | 2c82429f8957ed0268c0e4e4fe5aed9093f33960 (diff) | |
Bugzilla #4616:
- Merge various fb/ bits of COMPOSITE support from xserver, which weren't
necessary before due to cw hiding the issues. Fixes offset calculations
for a number of operations, and may pull some fixes that cairo has
wanted for XAA as well.
- Add a new call, miDisableCompositeWrapper(), which a DDX can call to keep
cw from getting initialized from the damage code. While it would be
cleaner to have each DDX initialize it if it needs it, we don't have
control over all of them (e.g. nvidia).
- Use the miDisableCompositeWrapper() to keep cw from getting set up for
screens using EXA, because EXA is already aware of composite. Avoiding
cw improved performance 0-35% on operations tested by ajax in x11perf.
Diffstat (limited to 'fb/fbpoint.c')
| -rw-r--r-- | fb/fbpoint.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/fb/fbpoint.c b/fb/fbpoint.c index 5ba24e0e5..5229d6970 100644 --- a/fb/fbpoint.c +++ b/fb/fbpoint.c @@ -35,6 +35,8 @@ typedef void (*FbDots) (FbBits *dst, BoxPtr pBox, xPoint *pts, int npt, + int xorg, + int yorg, int xoff, int yoff, FbBits and, @@ -47,6 +49,8 @@ fbDots (FbBits *dstOrig, BoxPtr pBox, xPoint *pts, int npt, + int xorg, + int yorg, int xoff, int yoff, FbBits andOrig, @@ -66,13 +70,13 @@ fbDots (FbBits *dstOrig, y2 = pBox->y2; while (npt--) { - x = pts->x + xoff; - y = pts->y + yoff; + x = pts->x + xorg; + y = pts->y + yorg; pts++; if (x1 <= x && x < x2 && y1 <= y && y < y2) { - x *= dstBpp; - d = dst + (y * dstStride) + (x >> FB_STIP_SHIFT); + x = (x + xoff) * dstBpp; + d = dst + ((y + yoff) * dstStride) + (x >> FB_STIP_SHIFT); x &= FB_STIP_MASK; #ifdef FB_24BIT if (dstBpp == 24) @@ -156,5 +160,5 @@ fbPolyPoint (DrawablePtr pDrawable, for (nBox = REGION_NUM_RECTS (pClip), pBox = REGION_RECTS (pClip); nBox--; pBox++) (*dots) (dst, dstStride, dstBpp, pBox, pptInit, nptInit, - pDrawable->x + dstXoff, pDrawable->y + dstYoff, and, xor); + pDrawable->x, pDrawable->y, dstXoff, dstYoff, and, xor); } |