From 75d2bbcf0f39b9c85bc270728343f61dabebce2d Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 8 Dec 2009 11:23:34 +0000 Subject: Git update 8/12/2009 --- xorg-server/exa/exa_accel.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'xorg-server/exa/exa_accel.c') diff --git a/xorg-server/exa/exa_accel.c b/xorg-server/exa/exa_accel.c index 1d88acbf0..0f6e5f78a 100644 --- a/xorg-server/exa/exa_accel.c +++ b/xorg-server/exa/exa_accel.c @@ -506,11 +506,9 @@ exaHWCopyNtoN (DrawablePtr pSrcDrawable, exaMarkSync (pDstDrawable->pScreen); /* UTS: mainly for SHM PutImage's secondary path. * - * Not taking this path for mixed pixmaps: It could only save one CPU - * copy between cached memory and risks causing a more expensive - * DownloadFromScreen later on. + * Only taking this path for directly accessible pixmaps. */ - } else if (!(pExaScr->info->flags & EXA_MIXED_PIXMAPS)) { + } else if (!pDstExaPixmap->pDamage) { int bpp = pSrcDrawable->bitsPerPixel; int src_stride = exaGetPixmapPitch(pSrcPixmap); CARD8 *src = NULL; -- cgit v1.2.3