diff options
author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2010-04-26 11:40:57 -0500 |
---|---|---|
committer | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2010-04-26 11:40:57 -0500 |
commit | be4b761f78e8c767915c15bbed3be23f0aec4db3 (patch) | |
tree | 96988d438d57dc98318bf2aa637897370ec43e97 /exa/exa_accel.c | |
parent | 4ae527cec2cd01a973351a8dec9816413522c963 (diff) | |
parent | b557571dbff3d9a615e03cad904d46b8af9153a0 (diff) |
Merge remote branch 'origin/master' into cygwincygwin
Diffstat (limited to 'exa/exa_accel.c')
-rw-r--r-- | exa/exa_accel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/exa/exa_accel.c b/exa/exa_accel.c index 4680c3709..57029fdc5 100644 --- a/exa/exa_accel.c +++ b/exa/exa_accel.c @@ -512,7 +512,7 @@ exaHWCopyNtoN (DrawablePtr pSrcDrawable, * * Only taking this path for directly accessible pixmaps. */ - } else if (!pDstExaPixmap->pDamage) { + } else if (!pDstExaPixmap->pDamage && pSrcExaPixmap->sys_ptr) { int bpp = pSrcDrawable->bitsPerPixel; int src_stride = exaGetPixmapPitch(pSrcPixmap); CARD8 *src = NULL; |