From 21fac6083862d6f7523bb99123c487013fc38fd9 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Mon, 28 Nov 2016 16:05:35 +0000 Subject: [PATCH] compositor-wayland: Set frame callback for Pixman Fixing 89c2f637b9, also set the output's frame_cb for the Pixman renderer, not just GL. Fixes a segfault when using compositor-wayland with --use-pixman. Signed-off-by: Daniel Stone Reviewed-by: Dima Ryazanov --- libweston/compositor-wayland.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c index 8f217af..60cd184 100644 --- a/libweston/compositor-wayland.c +++ b/libweston/compositor-wayland.c @@ -593,7 +593,6 @@ wayland_output_repaint_pixman(struct weston_output *output_base, struct wayland_output *output = to_wayland_output(output_base); struct wayland_backend *b = to_wayland_backend(output->base.compositor); - struct wl_callback *callback; struct wayland_shm_buffer *sb; if (output->frame) { @@ -613,8 +612,8 @@ wayland_output_repaint_pixman(struct weston_output *output_base, wayland_shm_buffer_attach(sb); - callback = wl_surface_frame(output->parent.surface); - wl_callback_add_listener(callback, &frame_listener, output); + output->frame_cb = wl_surface_frame(output->parent.surface); + wl_callback_add_listener(output->frame_cb, &frame_listener, output); wl_surface_commit(output->parent.surface); wl_display_flush(b->parent.wl_display); -- 2.7.4