diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-15 12:37:07 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-15 12:37:07 +0000 |
| commit | 8654ee514b4d79feec936501717a06892090d3b7 (patch) | |
| tree | 2787608c117268bc6ed9e399ea57b8e1d0aeb8e3 /xorg-server/exa | |
| parent | eb405babefc73e25ab8b7e6229709f85ef6a67b1 (diff) | |
| download | vcxsrv-8654ee514b4d79feec936501717a06892090d3b7.tar.gz vcxsrv-8654ee514b4d79feec936501717a06892090d3b7.tar.bz2 vcxsrv-8654ee514b4d79feec936501717a06892090d3b7.zip | |
svn merge -r530:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/exa')
| -rw-r--r-- | xorg-server/exa/exa_accel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/exa/exa_accel.c b/xorg-server/exa/exa_accel.c index 00a97fdbf..4823398b5 100644 --- a/xorg-server/exa/exa_accel.c +++ b/xorg-server/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;
|