diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-13 09:10:55 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-13 09:10:55 +0100 |
| commit | 8add148a4cf71b8bdab05a6b7e14824b5062da5e (patch) | |
| tree | 8e1c46d5e3884612833ae099806391c5db4d3792 /xorg-server/randr | |
| parent | 8753441b3ba4316448e1ae5f408e6a84b0116a3c (diff) | |
| download | vcxsrv-8add148a4cf71b8bdab05a6b7e14824b5062da5e.tar.gz vcxsrv-8add148a4cf71b8bdab05a6b7e14824b5062da5e.tar.bz2 vcxsrv-8add148a4cf71b8bdab05a6b7e14824b5062da5e.zip | |
mesa pixman xserver git update 13 Feb 2013
xserver commit 7115f6c709898a5124b67e19c61dc01334471358
pixman commit 5e207f825bd1ed3142a623bcbceca00508907c5e
mesa commit 8cabe26f5dc4c66ae59649cfd7b25f761cda250b
Diffstat (limited to 'xorg-server/randr')
| -rw-r--r-- | xorg-server/randr/rrcrtc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/xorg-server/randr/rrcrtc.c b/xorg-server/randr/rrcrtc.c index e82d050e3..6e2eca5ad 100644 --- a/xorg-server/randr/rrcrtc.c +++ b/xorg-server/randr/rrcrtc.c @@ -372,6 +372,11 @@ RRCrtcDetachScanoutPixmap(RRCrtcPtr crtc) ret = pScrPriv->rrCrtcSetScanoutPixmap(crtc, NULL); if (crtc->scanout_pixmap) { master->StopPixmapTracking(mscreenpix, crtc->scanout_pixmap); + /* + * Unref the pixmap twice: once for the original reference, and once + * for the reference implicitly added by PixmapShareToSlave. + */ + master->DestroyPixmap(crtc->scanout_pixmap->master_pixmap); master->DestroyPixmap(crtc->scanout_pixmap->master_pixmap); crtc->pScreen->DestroyPixmap(crtc->scanout_pixmap); } |