summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-06-20 00:09:20 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2010-06-20 00:10:43 +0100
commite8783869ad55d337601b6f6a51c02f6576c64f38 (patch)
treeb320cef708ee90b59756bd03b7da64c4b1d2b491
parent4b7142baa0b3bf6f38843d06aadc579d8624cefc (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>
-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 00a43b1a..ded66a13 100644
--- a/uxa/uxa-accel.c
+++ b/uxa/uxa-accel.c
@@ -562,13 +562,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;