xserver: Branch 'master'

[GitLab Mirror]

 present/present_wnmd.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a093a88531599832811a1ba5cb85101af91a545e
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Tue Jan 29 18:59:09 2019 +0100

    present/wnmd: Allow flipping if the window pixmap matches the toplevel's
    
    Instead of testing window->redirectDraw.
    
    With Xwayland, the toplevel window is always redirected, so this would
    unnecessarily preclude flipping there in some cases, e.g. with wlroots
    based Wayland compositors or with fullscreen X11 windows in weston.
    
    Fixes issue #631.

diff --git a/present/present_wnmd.c b/present/present_wnmd.c
index a2d9da8fb..9d0b147cc 100644
--- a/present/present_wnmd.c
+++ b/present/present_wnmd.c
@@ -270,8 +270,8 @@ present_wnmd_check_flip(RRCrtcPtr           crtc,
     if (!screen_priv->wnmd_info->flip)
         return FALSE;
 
-    /* Don't flip redirected windows */
-    if (window->redirectDraw != RedirectDrawNone)
+    /* Can't flip redirected child windows */
+    if (screen->GetWindowPixmap(window) != screen->GetWindowPixmap(toplvl_window))
         return FALSE;
 
     /* Source pixmap must align with window exactly */