diff options
author | marha <marha@users.sourceforge.net> | 2010-07-14 10:57:04 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-07-14 10:57:04 +0000 |
commit | 8fb9d7f4ca923dc7f640a0df6c871348a3e554ab (patch) | |
tree | 39ebbf9255fe0fd660ea645f4ebdef3287a5078b /xorg-server/exa/exa_mixed.c | |
parent | 80b785273c916676a94cbe1d7dfbbc93b58127d5 (diff) | |
parent | 865af20e32591176d03acf984d9b5788d5ebce21 (diff) | |
download | vcxsrv-8fb9d7f4ca923dc7f640a0df6c871348a3e554ab.tar.gz vcxsrv-8fb9d7f4ca923dc7f640a0df6c871348a3e554ab.tar.bz2 vcxsrv-8fb9d7f4ca923dc7f640a0df6c871348a3e554ab.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/exa/exa_mixed.c')
-rw-r--r-- | xorg-server/exa/exa_mixed.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/xorg-server/exa/exa_mixed.c b/xorg-server/exa/exa_mixed.c index 4425cede4..52144c9ad 100644 --- a/xorg-server/exa/exa_mixed.c +++ b/xorg-server/exa/exa_mixed.c @@ -245,9 +245,7 @@ exaDestroyPixmap_mixed(PixmapPtr pPixmap) {
ExaPixmapPriv (pPixmap);
- /* During a fallback we must finish access, but we don't know the index. */
- if (pExaScr->fallback_counter)
- exaFinishAccess(&pPixmap->drawable, -1);
+ exaDestroyPixmap(pPixmap);
if (pExaScr->deferred_mixed_pixmap == pPixmap)
pExaScr->deferred_mixed_pixmap = NULL;
|