<div dir="ltr">Looks good, thank you.<br></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Jul 18, 2013 at 7:33 PM, Carl Worth <span dir="ltr"><<a href="mailto:cworth@cworth.org" target="_blank">cworth@cworth.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="im">Philipp Brüschweiler <<a href="mailto:blei42@gmail.com">blei42@gmail.com</a>> writes:<br>
> I tried to apply my patch to the 9.1 branch, but I noticed that it depended<br>
> on 6dbe94c12cd1b3b912a7083055178e0dfd7372af, which has not been added to<br>
> 9.1 yet. Afterwards, it should apply cleanly.<br>
><br>
> My patch (and the one mentioned above) are still necessary to use egl<br>
> applications when Weston is using software rendering.<br>
<br>
</div>Thanks, Philipp.<br>
<br>
Since your fix is a fix for a bug introduced in that previous commit,<br>
I've gone ahead and merged these together for the stable branch as<br>
below. Let me know if this looks fine to you.<br>
<br>
-Carl<br>
<br>
commit d35ec5650794d033719d84c4ce6be9919f02efda<br>
Author: Kristian Høgsberg <<a href="mailto:krh@bitplanet.net">krh@bitplanet.net</a>><br>
Date: Thu Feb 14 20:47:29 2013 -0500<br>
<br>
egl-wayland: Fix left-over wl_display_roundtrip() usage<br>
<br>
We have to use the EGL wayland event queue for roundtrip, so use the<br>
wayland_roundtrip() helper, which does just that.<br>
<br>
(cherry picked from commit 6dbe94c12cd1b3b912a7083055178e0dfd7372af)<br>
<br>
This commit also merges the subsequent fix (by Philipp Brüschweiler<br>
<<a href="mailto:blei42@gmail.com">blei42@gmail.com</a>> ) for the segmentation fault introduced in the above<br>
commit:<br>
<div class="im"><br>
wayland: fix segfault when using software rendering<br>
<br>
wayland_roundtrip() was given an incorrect parameter.<br>
<br>
Fixes <a href="https://bugs.freedesktop.org/show_bug.cgi?id=62362" target="_blank">https://bugs.freedesktop.org/show_bug.cgi?id=62362</a><br>
<br>
Note: This is a candidate for the stable branches.<br>
<br>
Signed-off-by: Brian Paul <<a href="mailto:brianp@vmware.com">brianp@vmware.com</a>><br>
</div> (cherry picked from commit c07c18081e3b21070c7db3aea0c7a31a31ff20ce)<br>
<br>
diff --git a/src/gallium/state_trackers/egl/wayland/native_shm.c b/src/gallium/state_trackers/egl/wayland/native_shm.c<br>
index 9fb8077..2499677 100644<br>
<div class="im">--- a/src/gallium/state_trackers/egl/wayland/native_shm.c<br>
+++ b/src/gallium/state_trackers/egl/wayland/native_shm.c<br>
@@ -163,7 +163,7 @@ wayland_shm_display_init_screen(struct native_display *ndpy)<br>
return FALSE;<br>
<br>
if (shmdpy->base.formats == 0)<br>
</div>- wl_display_roundtrip(shmdpy->base.dpy);<br>
<div class="HOEnZb"><div class="h5">+ wayland_roundtrip(&shmdpy->base);<br>
if (shmdpy->base.formats == 0)<br>
return FALSE;<br>
</div></div></blockquote></div><br></div>