diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2013-12-04 12:08:35 -0800 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2013-12-12 15:33:59 -0800 |
| commit | 1919ec6ba43a8fb229495e2ebb87789fb11ffb8c (patch) | |
| tree | 11560ded654831ffad62d8a6ba89f34a5330f9f8 /src/egl/drivers | |
| parent | 188c60143b1e77e62ec8404e8ecde2472fe9b80f (diff) | |
egl/wayland: Send commit after flushing the driver context
This typically won't make a difference, since we only send the requests at
wl_display_flush() time. There might be a small race
with another thread calling wl_display_flush() after our commit request,
but before we flush the DRI driver. Moving the commit below the DRI
driver flush call looks more natural and eliminates the small race.
Cc: "10.0" mesa-stable@lists.freedesktop.org
(cherry picked from commit 33eb5eabeec0c17e81b6bb11be703701e4025d4e)
Diffstat (limited to 'src/egl/drivers')
| -rw-r--r-- | src/egl/drivers/dri2/platform_wayland.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index d28fb729131..82be48f8827 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -610,11 +610,10 @@ dri2_swap_buffers_with_damage(_EGLDriver *drv, } } - wl_surface_commit(dri2_surf->wl_win->surface); - (*dri2_dpy->flush->flush)(dri2_surf->dri_drawable); (*dri2_dpy->flush->invalidate)(dri2_surf->dri_drawable); + wl_surface_commit(dri2_surf->wl_win->surface); wl_display_flush(dri2_dpy->wl_dpy); return EGL_TRUE; |