aboutsummaryrefslogtreecommitdiff
path: root/backend/x11
diff options
context:
space:
mode:
authorSimon Zeni <simon@bl4ckb0ne.ca>2021-04-28 10:11:09 -0400
committerSimon Ser <contact@emersion.fr>2021-04-28 20:55:57 +0200
commitcc1b66364cc9f29456727f9864ee04e57babe8e7 (patch)
treeb560a03c1ca3e5efc973f27a64e9ce4aa784bab3 /backend/x11
parent318e3ac92cd3a172932370a7da8b2c2d24231758 (diff)
backend: use wlr_allocator_autocreate
Diffstat (limited to 'backend/x11')
-rw-r--r--backend/x11/backend.c41
1 files changed, 15 insertions, 26 deletions
diff --git a/backend/x11/backend.c b/backend/x11/backend.c
index 9ffdfb2d..8999912d 100644
--- a/backend/x11/backend.c
+++ b/backend/x11/backend.c
@@ -610,7 +610,7 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display,
return false;
}
- const struct wlr_drm_format_set *pixmap_formats;
+ x11->drm_fd = -1;
if (x11->have_dri3) {
// DRI3 may return a render node (Xwayland) or an authenticated primary
// node (plain Glamor).
@@ -619,41 +619,30 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display,
wlr_log(WLR_ERROR, "Failed to query DRI3 DRM FD");
goto error_event;
}
+ }
- char *drm_name = drmGetDeviceNameFromFd2(x11->drm_fd);
- wlr_log(WLR_DEBUG, "Using DRM node %s", drm_name);
- free(drm_name);
+ x11->renderer = wlr_renderer_autocreate(&x11->backend);
+ if (x11->renderer == NULL) {
+ wlr_log(WLR_ERROR, "Failed to create renderer");
+ goto error_event;
+ }
- int drm_fd = fcntl(x11->drm_fd, F_DUPFD_CLOEXEC, 0);
- if (drm_fd < 0) {
- wlr_log(WLR_ERROR, "fcntl(F_DUPFD_CLOEXEC) failed");
- goto error_event;
- }
+ uint32_t caps = renderer_get_render_buffer_caps(x11->renderer);
- 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;
- }
+ const struct wlr_drm_format_set *pixmap_formats;
+ if (x11->have_dri3 && (caps & WLR_BUFFER_CAP_DMABUF)) {
pixmap_formats = &x11->dri3_formats;
- } else if (x11->have_shm) {
- x11->drm_fd = -1;
- x11->allocator = wlr_shm_allocator_create();
- if (x11->allocator == NULL) {
- wlr_log(WLR_ERROR, "Failed to create shared memory allocator");
- goto error_event;
- }
+ } else if (x11->have_shm && (caps & WLR_BUFFER_CAP_DATA_PTR)) {
pixmap_formats = &x11->shm_formats;
} else {
wlr_log(WLR_ERROR,
- "Failed to create allocator (DRI3 and SHM unavailable)");
+ "Failed to create allocator (DRI3 and SHM unavailable)");
goto error_event;
}
- x11->renderer = wlr_renderer_autocreate(&x11->backend);
- if (x11->renderer == NULL) {
- wlr_log(WLR_ERROR, "Failed to create renderer");
+ x11->allocator = wlr_allocator_autocreate(&x11->backend, x11->renderer);
+ if (x11->allocator == NULL) {
+ wlr_log(WLR_ERROR, "Failed to create allocator");
goto error_event;
}