summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-06-20 00:09:20 +0100
committerOwain G. Ainsworth <oga@openbsd.org>2010-06-21 13:37:32 +0100
commitf1c431099cab48213a8b2257004f85564e33a23f (patch)
treeaafe5d752439d9df7699864bfb1b8a5b1cb0a7c5
parentd00c22a0b42b9acbbd43ea2fa37b97c1ff5034e2 (diff)
uxa: Apply the source offsets to the pixmap source, not target.
A slight confusion in computing the correction image location resulted in the application of the source offsets to the pixel location in the target and not in the source as intended. Fixes the visual corruption of the scrollbar in Chromium, and hopefully the crash reported by Robert Hooker when starting gdm after plymouth. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit e8783869ad55d337601b6f6a51c02f6576c64f38) Signed-off-by: Owain G. Ainsworth <oga@openbsd.org>
-rw-r--r--uxa/uxa-accel.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/uxa/uxa-accel.c b/uxa/uxa-accel.c
index 19d1ed11..5139b6a9 100644
--- a/uxa/uxa-accel.c
+++ b/uxa/uxa-accel.c
@@ -557,13 +557,13 @@ uxa_copy_n_to_n(DrawablePtr pSrcDrawable,
bpp /= 8;
while (nbox--) {
if (!uxa_screen->info->get_image(pSrcPixmap,
- pbox->x1 + src_off_x,
- pbox->y1 + src_off_y,
+ pbox->x1 + dx + src_off_x,
+ pbox->y1 + dy + src_off_y,
pbox->x2 - pbox->x1,
pbox->y2 - pbox->y1,
(char *) dst +
- (pbox->y1 + dy + dst_off_y) * stride +
- (pbox->x1 + dx + dst_off_x) * bpp,
+ (pbox->y1 + dst_off_y) * stride +
+ (pbox->x1 + dst_off_x) * bpp,
stride))
goto fallback;