<div dir="ltr">Yep, fixes the crash, thanks!<div><br></div><div>Reviewed-by: Dima Ryazanov <<a href="mailto:dima@gmail.com">dima@gmail.com</a>></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Nov 28, 2016 at 8:06 AM, Daniel Stone <span dir="ltr"><<a href="mailto:daniels@collabora.com" target="_blank">daniels@collabora.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Fixing 89c2f637b9, also set the output's frame_cb for the Pixman<br>
renderer, not just GL. Fixes a segfault when using compositor-wayland<br>
with --use-pixman.<br>
<br>
Signed-off-by: Daniel Stone <<a href="mailto:daniels@collabora.com">daniels@collabora.com</a>><br>
Cc: Dima Ryazanov <<a href="mailto:dima@gmail.com">dima@gmail.com</a>><br>
---<br>
libweston/compositor-wayland.c | 5 ++---<br>
1 file changed, 2 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/libweston/compositor-<wbr>wayland.c b/libweston/compositor-<wbr>wayland.c<br>
index 7c814c8..d1e387d 100644<br>
--- a/libweston/compositor-<wbr>wayland.c<br>
+++ b/libweston/compositor-<wbr>wayland.c<br>
@@ -593,7 +593,6 @@ wayland_output_repaint_pixman(<wbr>struct weston_output *output_base,<br>
struct wayland_output *output = to_wayland_output(output_base)<wbr>;<br>
struct wayland_backend *b =<br>
to_wayland_backend(output-><wbr>base.compositor);<br>
- struct wl_callback *callback;<br>
struct wayland_shm_buffer *sb;<br>
<br>
if (output->frame) {<br>
@@ -613,8 +612,8 @@ wayland_output_repaint_pixman(<wbr>struct weston_output *output_base,<br>
<br>
wayland_shm_buffer_attach(sb);<br>
<br>
- callback = wl_surface_frame(output-><wbr>parent.surface);<br>
- wl_callback_add_listener(<wbr>callback, &frame_listener, output);<br>
+ output->frame_cb = wl_surface_frame(output-><wbr>parent.surface);<br>
+ wl_callback_add_listener(<wbr>output->frame_cb, &frame_listener, output);<br>
wl_surface_commit(output-><wbr>parent.surface);<br>
wl_display_flush(b->parent.wl_<wbr>display);<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
2.9.3<br>
<br>
</font></span></blockquote></div><br></div>