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

backends: don't destroy renderer and output twice

Browse Source 
drm, fbdev, rpi and wayland backends are unnecessarily destroying
renderer and output before executing weston_compositor_shutdown()

Signed-off-by: Dawid Gajownik <gajownik@gmail.com>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
This commit is contained in:
Dawid Gajownik 2015-07-31 00:02:28 -03:00 committed by Daniel Stone
parent 405ae2feba
commit 82d4925b1a
4 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/compositor-drm.c
View File

@ -3165,7 +3165,6 @@ err_drm_source:
err_udev_input: err_udev_input:
udev_input_destroy(&b->input); udev_input_destroy(&b->input);
err_sprite: err_sprite:
compositor->renderer->destroy(compositor);
gbm_device_destroy(b->gbm); gbm_device_destroy(b->gbm);
destroy_sprites(b); destroy_sprites(b);
err_udev_dev: err_udev_dev:

5
src/compositor-fbdev.c
View File

@ -881,16 +881,13 @@ fbdev_backend_create(struct weston_compositor *compositor, int *argc, char *argv
} }
if (fbdev_output_create(backend, param->device) < 0) if (fbdev_output_create(backend, param->device) < 0)
goto out_pixman; goto out_launcher;
udev_input_init(&backend->input, compositor, backend->udev, seat_id); udev_input_init(&backend->input, compositor, backend->udev, seat_id);
compositor->backend = &backend->base; compositor->backend = &backend->base;
return backend; return backend;
out_pixman:
compositor->renderer->destroy(compositor);
out_launcher: out_launcher:
weston_launcher_destroy(compositor->launcher); weston_launcher_destroy(compositor->launcher);

7
src/compositor-rpi.c
View File

@ -522,20 +522,17 @@ rpi_backend_create(struct weston_compositor *compositor,
goto out_launcher; goto out_launcher;
if (rpi_output_create(backend, param->output_transform) < 0) if (rpi_output_create(backend, param->output_transform) < 0)
goto out_renderer; goto out_launcher;
if (udev_input_init(&backend->input, if (udev_input_init(&backend->input,
compositor, compositor,
backend->udev, "seat0") != 0) { backend->udev, "seat0") != 0) {
weston_log("Failed to initialize udev input.\n"); weston_log("Failed to initialize udev input.\n");
goto out_renderer; goto out_launcher;
} }
return backend; return backend;
out_renderer:
compositor->renderer->destroy(compositor);
out_launcher: out_launcher:
weston_launcher_destroy(compositor->launcher); weston_launcher_destroy(compositor->launcher);

10
src/compositor-wayland.c
View File

@ -2018,14 +2018,12 @@ wayland_backend_create(struct weston_compositor *compositor, int use_pixman,
wl_event_loop_add_fd(loop, fd, WL_EVENT_READABLE, wl_event_loop_add_fd(loop, fd, WL_EVENT_READABLE,
wayland_backend_handle_event, b); wayland_backend_handle_event, b);
if (b->parent.wl_source == NULL) if (b->parent.wl_source == NULL)
goto err_renderer; goto err_display;
wl_event_source_check(b->parent.wl_source); wl_event_source_check(b->parent.wl_source);
compositor->backend = &b->base; compositor->backend = &b->base;
return b; return b;
err_renderer:
compositor->renderer->destroy(compositor);
err_display: err_display:
wl_display_disconnect(b->parent.wl_display); wl_display_disconnect(b->parent.wl_display);
err_compositor: err_compositor:
@ -2037,12 +2035,6 @@ err_compositor:
static void static void
wayland_backend_destroy(struct wayland_backend *b) wayland_backend_destroy(struct wayland_backend *b)
{ {
struct weston_output *output, *next;
wl_list_for_each_safe(output, next, &b->compositor->output_list, link)
wayland_output_destroy(output);
b->compositor->renderer->destroy(b->compositor);
wl_display_disconnect(b->parent.wl_display); wl_display_disconnect(b->parent.wl_display);
if (b->theme) if (b->theme)