From cf5d6414e0c21140f763d618bde1e91ad2b1cb49 Mon Sep 17 00:00:00 2001 From: agoins Date: Wed, 25 Nov 2015 18:39:25 -0800 Subject: [PATCH] randr: Factor out shared pixmap destruction Shared pixmap destruction is done by unrefing the master pixmap twice: once for the original reference, and once for the reference implicitly added by PixmapShareToSlave. Then, unrefing the slave pixmap once. When I add PRIME double buffering and synchronization, I will need to do this in multiple places. To avoid duplication of code and comments explaining it everywhere, factor it out into its own function and use that in place of where it was before. Reviewed-by: Adam Jackson Signed-off-by: Alex Goins --- randr/rrcrtc.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c index 9bc456bdc..cbd03d000 100644 --- a/randr/rrcrtc.c +++ b/randr/rrcrtc.c @@ -361,6 +361,20 @@ RRComputeContiguity(ScreenPtr pScreen) pScrPriv->discontiguous = discontiguous; } +static void +rrDestroySharedPixmap(RRCrtcPtr crtc, PixmapPtr pPixmap) { + if (crtc->pScreen->current_master && pPixmap->master_pixmap) { + /* + * Unref the pixmap twice: once for the original reference, and once + * for the reference implicitly added by PixmapShareToSlave. + */ + crtc->pScreen->current_master->DestroyPixmap(pPixmap->master_pixmap); + crtc->pScreen->current_master->DestroyPixmap(pPixmap->master_pixmap); + } + + crtc->pScreen->DestroyPixmap(pPixmap); +} + void RRCrtcDetachScanoutPixmap(RRCrtcPtr crtc) { @@ -372,14 +386,7 @@ RRCrtcDetachScanoutPixmap(RRCrtcPtr crtc) 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); + rrDestroySharedPixmap(crtc, crtc->scanout_pixmap); } crtc->scanout_pixmap = NULL; RRCrtcChanged(crtc, TRUE);