diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-08-19 08:45:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-19 08:45:44 -0400 |
| commit | b876bea288bc4827a9de157eed481b823c081a4b (patch) | |
| tree | 94fb650815691f98ab633c7731496f14ac751dc2 /backend | |
| parent | 3674085faede2960581461cf8f40c33ffce85e7c (diff) | |
| parent | 84c0c87a5ddca24cb039f33eea38252681bb4636 (diff) | |
Merge pull request #114 from martinetd/cleanups
Cleanups
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/drm/drm.c | 4 | ||||
| -rw-r--r-- | backend/libinput/backend.c | 1 | ||||
| -rw-r--r-- | backend/wayland/backend.c | 1 | ||||
| -rw-r--r-- | backend/wayland/output.c | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 65ea7f45..332926b9 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -598,12 +598,12 @@ static bool wlr_drm_output_set_cursor(struct wlr_output *_output, wlr_matrix_texture(plane->matrix, plane->width, plane->height, output->output.transform ^ WL_OUTPUT_TRANSFORM_FLIPPED_180); - plane->wlr_rend = wlr_gles2_renderer_init(&backend->backend); + plane->wlr_rend = wlr_gles2_renderer_create(&backend->backend); if (!plane->wlr_rend) { return false; } - plane->wlr_tex = wlr_render_texture_init(plane->wlr_rend); + plane->wlr_tex = wlr_render_texture_create(plane->wlr_rend); if (!plane->wlr_tex) { return false; } diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c index 28947a5e..5dd93f47 100644 --- a/backend/libinput/backend.c +++ b/backend/libinput/backend.c @@ -109,6 +109,7 @@ static void wlr_libinput_backend_destroy(struct wlr_backend *_backend) { list_free(wlr_devices); } list_free(backend->wlr_device_lists); + wl_event_source_remove(backend->input_event); libinput_unref(backend->libinput_context); free(backend); } diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c index 7bb0d0e9..d917c7e9 100644 --- a/backend/wayland/backend.c +++ b/backend/wayland/backend.c @@ -88,6 +88,7 @@ static void wlr_wl_backend_destroy(struct wlr_backend *_backend) { list_free(backend->outputs); free(backend->seat_name); + wl_event_source_remove(backend->remote_display_src); wlr_egl_free(&backend->egl); if (backend->seat) wl_seat_destroy(backend->seat); if (backend->shm) wl_shm_destroy(backend->shm); diff --git a/backend/wayland/output.c b/backend/wayland/output.c index 16f9f017..e5079001 100644 --- a/backend/wayland/output.c +++ b/backend/wayland/output.c @@ -224,7 +224,6 @@ struct wlr_output *wlr_wl_output_create(struct wlr_backend *_backend) { wlr_output->width = 640; wlr_output->height = 480; - wlr_output->scale = 1; strncpy(wlr_output->make, "wayland", sizeof(wlr_output->make)); strncpy(wlr_output->model, "wayland", sizeof(wlr_output->model)); snprintf(wlr_output->name, sizeof(wlr_output->name), "WL-%zd", |