diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-10 07:43:34 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-10 07:43:34 +0000 |
| commit | 0540eb5a1f795c0f5265d244ec979b8ddfcf3acb (patch) | |
| tree | 06c5c3f4394f2d6d48c95ed1bfbab3a44e9996cc /xorg-server/exa/exa_accel.c | |
| parent | 5c72c54bc068bf12007dc15b353b1b2795e9aaf5 (diff) | |
| parent | 75d2bbcf0f39b9c85bc270728343f61dabebce2d (diff) | |
| download | vcxsrv-0540eb5a1f795c0f5265d244ec979b8ddfcf3acb.tar.gz vcxsrv-0540eb5a1f795c0f5265d244ec979b8ddfcf3acb.tar.bz2 vcxsrv-0540eb5a1f795c0f5265d244ec979b8ddfcf3acb.zip | |
svn merge ^/trunk .
Diffstat (limited to 'xorg-server/exa/exa_accel.c')
| -rw-r--r-- | xorg-server/exa/exa_accel.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xorg-server/exa/exa_accel.c b/xorg-server/exa/exa_accel.c index c2b8ade4b..bd34f40fd 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;
|