[Mesa-stable] Request for update of commit proposed for stable branch

[Philipp Brüschweiler]

Looks good, thank you.


On Thu, Jul 18, 2013 at 7:33 PM, Carl Worth <cworth at cworth.org> wrote:

> Philipp Brüschweiler <blei42 at gmail.com> writes:
> > I tried to apply my patch to the 9.1 branch, but I noticed that it
> depended
> > on 6dbe94c12cd1b3b912a7083055178e0dfd7372af, which has not been added to
> > 9.1 yet. Afterwards, it should apply cleanly.
> >
> > My patch (and the one mentioned above) are still necessary to use egl
> > applications when Weston is using software rendering.
>
> Thanks, Philipp.
>
> Since your fix is a fix for a bug introduced in that previous commit,
> I've gone ahead and merged these together for the stable branch as
> below. Let me know if this looks fine to you.
>
> -Carl
>
> commit d35ec5650794d033719d84c4ce6be9919f02efda
> Author: Kristian Høgsberg <krh at bitplanet.net>
> 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
>     <blei42 at gmail.com> ) 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 <brianp at vmware.com>
>     (cherry picked from commit c07c18081e3b21070c7db3aea0c7a31a31ff20ce)
>
> 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;
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-stable/attachments/20130718/2738083b/attachment.html>