summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDerek Foreman <[email protected]>2018-03-22 10:20:43 -0500
committerJuan A. Suarez Romero <[email protected]>2018-04-12 21:49:29 +0200
commit50e3fb590c615155ad9fb694b7c49992e0319a24 (patch)
tree9a605c1bd612f8d949097bcb570db8a8115333de /src
parent9776580d9713be55098e776954796377dc0ca201 (diff)
egl/wayland: Make swrast display_sync the correct queue
commit 03dd9a88b0be17ff0ce91e92f6902a9a85ba584a introduced per surface queues, but the display_sync for swrast_commit_backbuffer remained on the old queue. This is likely to break when dispatching the correct queue at the top of function (which can't dispatch the sync callback we're waiting for). The easiest known reproduction case is running weston-subsurfaces under weston --use-pixman Signed-off-by: Derek Foreman <[email protected]> Reviewed-by: Daniel Stone <[email protected]> (cherry picked from commit aa18a63512ccfa4eb8bc5d043e8967738a465af4)
Diffstat (limited to 'src')
-rw-r--r--src/egl/drivers/dri2/platform_wayland.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index 75bb1c508c1..af0856a3c9e 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -1769,7 +1769,7 @@ dri2_wl_swrast_commit_backbuffer(struct dri2_egl_surface *dri2_surf)
* handle the commit and send a release event before checking for a free
* buffer */
if (dri2_surf->throttle_callback == NULL) {
- dri2_surf->throttle_callback = wl_display_sync(dri2_dpy->wl_dpy_wrapper);
+ dri2_surf->throttle_callback = wl_display_sync(dri2_surf->wl_dpy_wrapper);
wl_callback_add_listener(dri2_surf->throttle_callback,
&throttle_listener, dri2_surf);
}