From: Jørgen Lind <jorgen.lind@nokia.com>
Date: Thu, 15 Sep 2011 15:36:46 +0000 (+0200)
Subject: wayland: Flush before blocking in swapbuffers.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0763b978eea5f133e43fb223d50c08fcca5397a2;p=mesa.git

wayland: Flush before blocking in swapbuffers.

Make sure that we've sent the frame request that we're going to block on.
---

diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index ff641ee2b27..7a70d8d5905 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -574,8 +574,11 @@ dri2_swap_buffers(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *draw)
    struct dri2_egl_driver *dri2_drv = dri2_egl_driver(drv);
    struct wl_callback *callback;
 
-   while (dri2_surf->block_swap_buffers)
-      wl_display_iterate(dri2_dpy->wl_dpy, WL_DISPLAY_READABLE);
+   if (dri2_surf->block_swap_buffers) {
+      wl_display_flush(dri2_dpy->wl_dpy);
+      while (dri2_surf->block_swap_buffers)
+         wl_display_iterate(dri2_dpy->wl_dpy, WL_DISPLAY_READABLE);
+   }
 
    dri2_surf->block_swap_buffers = EGL_TRUE;
    callback = wl_surface_frame(dri2_surf->wl_win->surface);