diff options
| author | agoins <agoins@nvidia.com> | 2015-11-25 18:39:31 -0800 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2015-12-01 13:44:31 -0500 |
| commit | c7f4aef8f45e500c900d59f68c653477148907ea (patch) | |
| tree | f180757e62f8ceda4780992b2eaff96b275a5621 /randr | |
| parent | 8d3f0e964e399dcfa8eb5e85d405217fdc5dbcd4 (diff) | |
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@redhat.com>
Signed-off-by: Alex Goins <agoins@nvidia.com>
Diffstat (limited to 'randr')
| -rw-r--r-- | randr/rrcrtc.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c index 6e459edf3..8d9c5bb05 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); |