Module: Mesa Branch: 9.1 Commit: e47f8b432d2cc63111403bd52ae045d15e9eac81 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e47f8b432d2cc63111403bd52ae045d15e9eac81
Author: Kristian Høgsberg <[email protected]> Date: Thu Feb 14 20:47:29 2013 -0500 egl-wayland: Fix left-over wl_display_roundtrip() usage We have to use the EGL wayland event queue for roundtrip, so use the wayland_roundtrip() helper, which does just that. (cherry picked from commit 6dbe94c12cd1b3b912a7083055178e0dfd7372af) This commit also merges the subsequent fix (by Philipp Brüschweiler <[email protected]> ) for the segmentation fault introduced in the above commit: wayland: fix segfault when using software rendering wayland_roundtrip() was given an incorrect parameter. Fixes https://bugs.freedesktop.org/show_bug.cgi?id=62362 Note: This is a candidate for the stable branches. Signed-off-by: Brian Paul <[email protected]> (cherry picked from commit c07c18081e3b21070c7db3aea0c7a31a31ff20ce) --- .../state_trackers/egl/wayland/native_shm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/gallium/state_trackers/egl/wayland/native_shm.c b/src/gallium/state_trackers/egl/wayland/native_shm.c index 9fb8077..2499677 100644 --- a/src/gallium/state_trackers/egl/wayland/native_shm.c +++ b/src/gallium/state_trackers/egl/wayland/native_shm.c @@ -163,7 +163,7 @@ wayland_shm_display_init_screen(struct native_display *ndpy) return FALSE; if (shmdpy->base.formats == 0) - wl_display_roundtrip(shmdpy->base.dpy); + wayland_roundtrip(&shmdpy->base); if (shmdpy->base.formats == 0) return FALSE; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
