mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-wayland: Destroy shm buffers on output disable

Browse Source 
Reviewed-by: Armin Krezović <krezovic.armin@gmail.com>
This commit is contained in:
Armin Krezović 2016-10-09 17:30:29 +02:00 committed by Daniel Stone
parent 78895c5fd8
commit 2e66252582
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libweston/compositor-wayland.c
View File

@ -629,6 +629,19 @@ wayland_backend_destroy_output_surface(struct wayland_output *output)
wl_surface_destroy(output->parent.surface); wl_surface_destroy(output->parent.surface);
} }
static void
wayland_output_destroy_shm_buffers(struct wayland_output *output)
{
struct wayland_shm_buffer *buffer, *next;
/* Throw away any remaining SHM buffers */
wl_list_for_each_safe(buffer, next, &output->shm.free_buffers, free_link)
wayland_shm_buffer_destroy(buffer);
/* These will get thrown away when they get released */
wl_list_for_each(buffer, &output->shm.buffers, link)
buffer->output = NULL;
}
static int static int
wayland_output_disable(struct weston_output *base) wayland_output_disable(struct weston_output *base)
{ {
@ -645,6 +658,8 @@ wayland_output_disable(struct weston_output *base)
wl_egl_window_destroy(output->gl.egl_window); wl_egl_window_destroy(output->gl.egl_window);
} }
wayland_output_destroy_shm_buffers(output);
wayland_backend_destroy_output_surface(output); wayland_backend_destroy_output_surface(output);
if (output->frame) if (output->frame)
@ -719,7 +734,6 @@ wayland_output_resize_surface(struct wayland_output *output)
{ {
struct wayland_backend *b = struct wayland_backend *b =
to_wayland_backend(output->base.compositor); to_wayland_backend(output->base.compositor);
struct wayland_shm_buffer *buffer, *next;
int32_t ix, iy, iwidth, iheight; int32_t ix, iy, iwidth, iheight;
int32_t width, height; int32_t width, height;
struct wl_region *region; struct wl_region *region;
@ -783,12 +797,7 @@ wayland_output_resize_surface(struct wayland_output *output)
output->gl.border.bottom = NULL; output->gl.border.bottom = NULL;
} }
/* Throw away any remaining SHM buffers */ wayland_output_destroy_shm_buffers(output);
wl_list_for_each_safe(buffer, next, &output->shm.free_buffers, free_link)
wayland_shm_buffer_destroy(buffer);
/* These will get thrown away when they get released */
wl_list_for_each(buffer, &output->shm.buffers, link)
buffer->output = NULL;
} }
static int static int