xserver: Branch 'master'

[Adam Jackson]

 randr/rrcrtc.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit c7f4aef8f45e500c900d59f68c653477148907ea
Author: agoins <agoins at nvidia.com>
Date:   Wed Nov 25 18:39:31 2015 -0800

    randr: Cleanup rrSetupPixmapSharing()
    
    protopix is completely redundant with mscreenpix. Get rid of it.
    
    We don't need rrScrPriv, so remove it.
    
    [ajax: also squash an unused variable in RRCrtcDetachScanoutPixmap,
    though it'll come back when the rest of this series lands]
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Alex Goins <agoins at nvidia.com>

diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index 6e459ed..8d9c5bb 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -379,11 +379,8 @@ void
 RRCrtcDetachScanoutPixmap(RRCrtcPtr crtc)
 {
     ScreenPtr master = crtc->pScreen->current_master;
-    PixmapPtr mscreenpix;
     rrScrPriv(crtc->pScreen);
 
-    mscreenpix = master->GetScreenPixmap(master);
-
     pScrPriv->rrCrtcSetScanoutPixmap(crtc, NULL);
     if (crtc->scanout_pixmap) {
         rrDestroySharedPixmap(crtc, crtc->scanout_pixmap);
@@ -429,8 +426,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;
 
     /* create a pixmap on the master screen,
@@ -442,7 +437,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);