summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--present/present_scmd.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/present/present_scmd.c b/present/present_scmd.c
index 3b7fbd832..6a580cb7a 100644
--- a/present/present_scmd.c
+++ b/present/present_scmd.c
@@ -78,7 +78,7 @@ present_check_flip(RRCrtcPtr crtc,
PresentFlipReason *reason)
{
ScreenPtr screen = window->drawable.pScreen;
- PixmapPtr screen_pixmap, window_pixmap;
+ PixmapPtr window_pixmap;
WindowPtr root = screen->root;
present_screen_priv_ptr screen_priv = present_screen_priv(screen);
@@ -99,9 +99,8 @@ present_check_flip(RRCrtcPtr crtc,
return FALSE;
/* Make sure the window hasn't been redirected with Composite */
- screen_pixmap = screen->GetScreenPixmap(screen);
window_pixmap = screen->GetWindowPixmap(window);
- if (window_pixmap != screen_pixmap &&
+ if (window_pixmap != screen->GetScreenPixmap(screen) &&
window_pixmap != screen_priv->flip_pixmap &&
window_pixmap != present_flip_pending_pixmap(screen))
return FALSE;
@@ -127,8 +126,7 @@ present_check_flip(RRCrtcPtr crtc,
window->drawable.x != pixmap->screen_x || window->drawable.y != pixmap->screen_y ||
#endif
window->drawable.width != pixmap->drawable.width ||
- window->drawable.height != pixmap->drawable.height ||
- pixmap->devKind != screen_pixmap->devKind) {
+ window->drawable.height != pixmap->drawable.height) {
return FALSE;
}