[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freedesktop-xorg-devel
Subject:    [PATCH 07/11] randr: Cleanup rrSetupPixmapSharing()
From:       Alex Goins <agoins () nvidia ! com>
Date:       2015-11-26 2:39:31
Message-ID: 75b52916ddb788047413e68ead2285f01bb24f11.1448493820.git.agoins () nvidia ! com
[Download RAW message or body]

protopix is completely redundant with mscreenpix. Get rid of it.

We don't need rrScrPriv, so remove it.

Signed-off-by: Alex Goins <agoins@nvidia.com>
---
 randr/rrcrtc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index a6b56f4..7f2a315 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -467,8 +467,6 @@ rrSetupPixmapSharing(RRCrtcPtr crtc, int width, int height,
     ScreenPtr master = crtc->pScreen->current_master;
     int depth;
     PixmapPtr mscreenpix;
-    PixmapPtr protopix = master->GetScreenPixmap(master);
-    rrScrPriv(crtc->pScreen);
     PixmapPtr spix_front;
 
     /* create a pixmap on the master screen,
@@ -484,7 +482,7 @@ rrSetupPixmapSharing(RRCrtcPtr crtc, int width, int height,
     */
 
     mscreenpix = master->GetScreenPixmap(master);
-    depth = protopix->drawable.depth;
+    depth = mscreenpix->drawable.depth;
 
     if (crtc->scanout_pixmap)
         RRCrtcDetachScanoutPixmap(crtc);
-- 
1.9.1

_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
[prev in list] [next in list] [prev in thread] [next in thread]