diff options
| author | Simon Zeni <simon@bl4ckb0ne.ca> | 2021-04-21 21:29:33 -0400 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2021-04-28 20:55:57 +0200 |
| commit | a8c91fbac9cad234fc074a9a7fea30bb7fb14489 (patch) | |
| tree | 12041fe1fb8cad7520e3466a8ef0d1de3cca7f1d /backend | |
| parent | c75aa71816826907805606a108626b4671120a7e (diff) | |
render/shm_allocator: make wlr_shm_allocator_create return a wlr_allocator
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/wayland/backend.c | 10 | ||||
| -rw-r--r-- | backend/x11/backend.c | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c index 42f4d6e2..60ac76cb 100644 --- a/backend/wayland/backend.c +++ b/backend/wayland/backend.c @@ -452,21 +452,19 @@ struct wlr_backend *wlr_wl_backend_create(struct wl_display *display, goto error_drm_fd; } - struct wlr_allocator *alloc = wlr_gbm_allocator_create(drm_fd); - if (alloc == NULL) { + wl->allocator = wlr_gbm_allocator_create(drm_fd); + if (wl->allocator == NULL) { wlr_log(WLR_ERROR, "Failed to create GBM allocator"); close(drm_fd); goto error_drm_fd; } - wl->allocator = alloc; } else { wlr_log(WLR_DEBUG, "No render node found, falling back to shared memory"); - struct wlr_shm_allocator *shm_alloc = wlr_shm_allocator_create(); - if (shm_alloc == NULL) { + wl->allocator = wlr_shm_allocator_create(); + if (wl->allocator == NULL) { wlr_log(WLR_ERROR, "Failed to create shared memory allocator"); goto error_remote_display_src; } - wl->allocator = &shm_alloc->base; } wl->renderer = wlr_renderer_autocreate(&wl->backend); diff --git a/backend/x11/backend.c b/backend/x11/backend.c index 06bbfc6c..743f19ff 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -622,22 +622,20 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display, goto error_event; } - struct wlr_allocator *alloc = wlr_gbm_allocator_create(drm_fd); - if (alloc == NULL) { + x11->allocator = wlr_gbm_allocator_create(drm_fd); + if (x11->allocator == NULL) { wlr_log(WLR_ERROR, "Failed to create GBM allocator"); close(drm_fd); goto error_event; } - x11->allocator = alloc; pixmap_formats = &x11->dri3_formats; } else if (x11->have_shm) { x11->drm_fd = -1; - struct wlr_shm_allocator *shm_alloc = wlr_shm_allocator_create(); - if (shm_alloc == NULL) { + x11->allocator = wlr_shm_allocator_create(); + if (x11->allocator == NULL) { wlr_log(WLR_ERROR, "Failed to create shared memory allocator"); goto error_event; } - x11->allocator = &shm_alloc->base; pixmap_formats = &x11->shm_formats; } else { wlr_log(WLR_ERROR, |