mirror of
https://gitlab.freedesktop.org/wlroots/wlroots.git
synced 2026-04-18 06:47:31 -04:00
Merge branch 'vk-upload-thread' into 'master'
Draft: render/vulkan: add upload thread See merge request wlroots/wlroots!4454
This commit is contained in:
commit
9e53f89c1b
21 changed files with 378 additions and 88 deletions
|
|
@ -39,9 +39,10 @@
|
|||
#define WAIT_SESSION_TIMEOUT 10000 // ms
|
||||
|
||||
void wlr_backend_init(struct wlr_backend *backend,
|
||||
const struct wlr_backend_impl *impl) {
|
||||
const struct wlr_backend_impl *impl, struct wl_event_loop *loop) {
|
||||
*backend = (struct wlr_backend){
|
||||
.impl = impl,
|
||||
.event_loop = loop,
|
||||
};
|
||||
wl_signal_init(&backend->events.destroy);
|
||||
wl_signal_init(&backend->events.new_input);
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@ struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
|
|||
wlr_log_errno(WLR_ERROR, "Allocation failed");
|
||||
return NULL;
|
||||
}
|
||||
wlr_backend_init(&drm->backend, &backend_impl);
|
||||
wlr_backend_init(&drm->backend, &backend_impl, wl_display_get_event_loop(display));
|
||||
|
||||
drm->session = session;
|
||||
wl_list_init(&drm->fbs);
|
||||
|
|
|
|||
|
|
@ -13,7 +13,8 @@
|
|||
|
||||
bool init_drm_renderer(struct wlr_drm_backend *drm,
|
||||
struct wlr_drm_renderer *renderer) {
|
||||
renderer->wlr_rend = renderer_autocreate_with_drm_fd(drm->fd);
|
||||
renderer->wlr_rend = renderer_autocreate_with_drm_fd(drm->fd,
|
||||
wl_display_get_event_loop(drm->display));
|
||||
if (!renderer->wlr_rend) {
|
||||
wlr_log(WLR_ERROR, "Failed to create renderer");
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ struct wlr_backend *wlr_headless_backend_create(struct wl_display *display) {
|
|||
return NULL;
|
||||
}
|
||||
|
||||
wlr_backend_init(&backend->backend, &backend_impl);
|
||||
wlr_backend_init(&backend->backend, &backend_impl, wl_display_get_event_loop(display));
|
||||
|
||||
backend->display = display;
|
||||
wl_list_init(&backend->outputs);
|
||||
|
|
|
|||
|
|
@ -199,7 +199,7 @@ struct wlr_backend *wlr_libinput_backend_create(struct wl_display *display,
|
|||
wlr_log(WLR_ERROR, "Allocation failed: %s", strerror(errno));
|
||||
return NULL;
|
||||
}
|
||||
wlr_backend_init(&backend->backend, &backend_impl);
|
||||
wlr_backend_init(&backend->backend, &backend_impl, wl_display_get_event_loop(display));
|
||||
|
||||
wl_list_init(&backend->devices);
|
||||
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ struct wlr_backend *wlr_multi_backend_create(struct wl_display *display) {
|
|||
}
|
||||
|
||||
wl_list_init(&backend->backends);
|
||||
wlr_backend_init(&backend->backend, &backend_impl);
|
||||
wlr_backend_init(&backend->backend, &backend_impl, wl_display_get_event_loop(display));
|
||||
|
||||
wl_signal_init(&backend->events.backend_add);
|
||||
wl_signal_init(&backend->events.backend_remove);
|
||||
|
|
|
|||
|
|
@ -577,7 +577,7 @@ struct wlr_backend *wlr_wl_backend_create(struct wl_display *display,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
wlr_backend_init(&wl->backend, &backend_impl);
|
||||
wlr_backend_init(&wl->backend, &backend_impl, wl_display_get_event_loop(display));
|
||||
|
||||
wl->local_display = display;
|
||||
wl_list_init(&wl->outputs);
|
||||
|
|
|
|||
|
|
@ -400,7 +400,7 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
wlr_backend_init(&x11->backend, &backend_impl);
|
||||
wlr_backend_init(&x11->backend, &backend_impl, wl_display_get_event_loop(display));
|
||||
x11->wl_display = display;
|
||||
wl_list_init(&x11->outputs);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue