mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-12-16 08:56:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

backend: use wlr_allocator_autocreate

Browse source
This commit is contained in:
Simon Zeni 2021-04-28 10:11:09 -04:00 • committed by Simon Ser
parent 318e3ac92c
commit cc1b66364c
4 changed files with 54 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

51
backend/x11/backend.c
View file

@ -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,36 +619,6 @@ 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);
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;
}
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;
}
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;
}
pixmap_formats = &x11->shm_formats;
} else {
wlr_log(WLR_ERROR,
"Failed to create allocator (DRI3 and SHM unavailable)");
goto error_event;
}
x11->renderer = wlr_renderer_autocreate(&x11->backend);
@ -657,6 +627,25 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display,
goto error_event;
}
uint32_t caps = renderer_get_render_buffer_caps(x11->renderer);
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 && (caps & WLR_BUFFER_CAP_DATA_PTR)) {
pixmap_formats = &x11->shm_formats;
} else {
wlr_log(WLR_ERROR,
"Failed to create allocator (DRI3 and SHM unavailable)");
goto error_event;
}
x11->allocator = wlr_allocator_autocreate(&x11->backend, x11->renderer);
if (x11->allocator == NULL) {
wlr_log(WLR_ERROR, "Failed to create allocator");
goto error_event;
}
const struct wlr_drm_format_set *render_formats =
wlr_renderer_get_render_formats(x11->renderer);
if (render_formats == NULL) {