hw/xwayland/xwayland-glamor-eglstream.c

@@ -681,7 +681,8 @@ xwl_glamor_eglstream_allow_commits(struct xwl_window *xwl_window)
 
             return FALSE;
         } else {
-            if (xwl_pixmap->surface != EGL_NO_SURFACE)
+            if (xwl_pixmap->surface != EGL_NO_SURFACE ||
+                xwl_pixmap->type == XWL_PIXMAP_DMA_BUF)
                 return TRUE;
 
             /* The pending stream got removed, we have a xwl_pixmap and

hw/xwayland/xwayland-present.c

@@ -404,6 +404,9 @@ xwl_present_check_flip2(RRCrtcPtr crtc,
     if (!xwl_window)
         return FALSE;
 
+    if (!xwl_glamor_pixmap_get_wl_buffer(pixmap))
+        return FALSE;
+
     if (!xwl_glamor_check_flip(pixmap))
         return FALSE;
 

hw/xwayland/xwayland-screen.c

@@ -52,6 +52,10 @@
 #include "xwayland-present.h"
 #include "xwayland-shm.h"
 
+#ifdef MITSHM
+#include "shmint.h"
+#endif
+
 #include "xdg-output-unstable-v1-client-protocol.h"
 #include "viewporter-client-protocol.h"
 #include "xdg-shell-client-protocol.h"
@@ -662,6 +666,10 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv)
 
     fbPictureInit(pScreen, 0, 0);
 
+#ifdef MITSHM
+    ShmRegisterFbFuncs(pScreen);
+#endif
+
 #ifdef HAVE_XSHMFENCE
     if (!miSyncShmScreenInit(pScreen))
         return FALSE;