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.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.c')
| -rw-r--r-- | xorg-server/exa/exa.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/xorg-server/exa/exa.c b/xorg-server/exa/exa.c index 16f39f6f0..023288c12 100644 --- a/xorg-server/exa/exa.c +++ b/xorg-server/exa/exa.c @@ -323,17 +323,10 @@ ExaDoPrepareAccess(PixmapPtr pPixmap, int index) has_gpu_copy = exaPixmapHasGpuCopy(pPixmap); - if (has_gpu_copy) { - /* This can be NULL, but the driver prepareAccess call should - * take care of that. */ + if (has_gpu_copy && pExaPixmap->fb_ptr) pPixmap->devPrivate.ptr = pExaPixmap->fb_ptr; - pPixmap->devKind = pExaPixmap->fb_pitch; - } else { - /* For mixed pixmaps this can be NULL, but that will be fixed - * later in exaPrepareAccessReg_mixed(). */ + else pPixmap->devPrivate.ptr = pExaPixmap->sys_ptr; - pPixmap->devKind = pExaPixmap->sys_pitch; - } /* Store so we can handle repeated / nested calls. */ pExaScr->access[index].pixmap = pPixmap; |