From 890ed0e082e048fa8daf48229b40558381bd131d Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom Date: Sun, 6 Nov 2005 16:40:59 +0000 Subject: [PATCH] Fix a bug where a system memory pixmap got a wrong address if memcpy() fallback was used for downloading from screen. --- exa/exa.c | 2 +- exa/exa_accel.c | 2 +- exa/exa_migration.c | 2 +- hw/xfree86/exa/exa.c | 2 +- hw/xfree86/exa/exa_accel.c | 2 +- hw/xfree86/exa/exa_migration.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/exa/exa.c b/exa/exa.c index 4d2014d44..f865e233e 100644 --- a/exa/exa.c +++ b/exa/exa.c @@ -156,7 +156,7 @@ exaPixmapSave (ScreenPtr pScreen, ExaOffscreenArea *area) } pPixmap->devKind = dst_pitch; - pPixmap->devPrivate.ptr = dst; + pPixmap->devPrivate.ptr = pExaPixmap->devPrivate.ptr; pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pExaPixmap->area = NULL; /* Mark it dirty now, to say that there is important data in the diff --git a/exa/exa_accel.c b/exa/exa_accel.c index 4d2014d44..f865e233e 100644 --- a/exa/exa_accel.c +++ b/exa/exa_accel.c @@ -156,7 +156,7 @@ exaPixmapSave (ScreenPtr pScreen, ExaOffscreenArea *area) } pPixmap->devKind = dst_pitch; - pPixmap->devPrivate.ptr = dst; + pPixmap->devPrivate.ptr = pExaPixmap->devPrivate.ptr; pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pExaPixmap->area = NULL; /* Mark it dirty now, to say that there is important data in the diff --git a/exa/exa_migration.c b/exa/exa_migration.c index 4d2014d44..f865e233e 100644 --- a/exa/exa_migration.c +++ b/exa/exa_migration.c @@ -156,7 +156,7 @@ exaPixmapSave (ScreenPtr pScreen, ExaOffscreenArea *area) } pPixmap->devKind = dst_pitch; - pPixmap->devPrivate.ptr = dst; + pPixmap->devPrivate.ptr = pExaPixmap->devPrivate.ptr; pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pExaPixmap->area = NULL; /* Mark it dirty now, to say that there is important data in the diff --git a/hw/xfree86/exa/exa.c b/hw/xfree86/exa/exa.c index 4d2014d44..f865e233e 100644 --- a/hw/xfree86/exa/exa.c +++ b/hw/xfree86/exa/exa.c @@ -156,7 +156,7 @@ exaPixmapSave (ScreenPtr pScreen, ExaOffscreenArea *area) } pPixmap->devKind = dst_pitch; - pPixmap->devPrivate.ptr = dst; + pPixmap->devPrivate.ptr = pExaPixmap->devPrivate.ptr; pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pExaPixmap->area = NULL; /* Mark it dirty now, to say that there is important data in the diff --git a/hw/xfree86/exa/exa_accel.c b/hw/xfree86/exa/exa_accel.c index 4d2014d44..f865e233e 100644 --- a/hw/xfree86/exa/exa_accel.c +++ b/hw/xfree86/exa/exa_accel.c @@ -156,7 +156,7 @@ exaPixmapSave (ScreenPtr pScreen, ExaOffscreenArea *area) } pPixmap->devKind = dst_pitch; - pPixmap->devPrivate.ptr = dst; + pPixmap->devPrivate.ptr = pExaPixmap->devPrivate.ptr; pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pExaPixmap->area = NULL; /* Mark it dirty now, to say that there is important data in the diff --git a/hw/xfree86/exa/exa_migration.c b/hw/xfree86/exa/exa_migration.c index 4d2014d44..f865e233e 100644 --- a/hw/xfree86/exa/exa_migration.c +++ b/hw/xfree86/exa/exa_migration.c @@ -156,7 +156,7 @@ exaPixmapSave (ScreenPtr pScreen, ExaOffscreenArea *area) } pPixmap->devKind = dst_pitch; - pPixmap->devPrivate.ptr = dst; + pPixmap->devPrivate.ptr = pExaPixmap->devPrivate.ptr; pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pExaPixmap->area = NULL; /* Mark it dirty now, to say that there is important data in the