mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-16 06:59:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add pointer to backend inside wlr_output

Browse source
This commit is contained in:
Scott Anderson 2017-10-21 17:37:25 +13:00
parent 4ea84c5765
commit 822a9f65a4
6 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/drm/drm.c
View file

@ -707,7 +707,7 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *drm) {
drmModeFreeConnector(drm_conn);
continue;
}
wlr_output_init(&wlr_conn->output, &output_impl);
wlr_output_init(&wlr_conn->output, &drm->backend, &output_impl);
struct wl_event_loop *ev = wl_display_get_event_loop(drm->display);
wlr_conn->retry_pageflip = wl_event_loop_add_timer(ev, retry_pageflip,

2
backend/wayland/output.c
View file

@ -241,7 +241,7 @@ struct wlr_output *wlr_wl_output_create(struct wlr_backend *_backend) {
wlr_log(L_ERROR, "Failed to allocate wlr_wl_backend_output");
return NULL;
}
wlr_output_init(&output->wlr_output, &output_impl);
wlr_output_init(&output->wlr_output, &backend->backend, &output_impl);
struct wlr_output *wlr_output = &output->wlr_output;
wlr_output->width = 640;

2
backend/x11/backend.c
View file

@ -264,7 +264,7 @@ static bool wlr_x11_backend_start(struct wlr_backend *backend) {
output->x11 = x11;
wlr_output_init(&output->wlr_output, &output_impl);
wlr_output_init(&output->wlr_output, &x11->backend, &output_impl);
snprintf(output->wlr_output.name, sizeof(output->wlr_output.name), "X11-1");
output->win = xcb_generate_id(x11->xcb_conn);