aboutsummaryrefslogtreecommitdiff
path: root/backend
diff options
context:
space:
mode:
authorScott Anderson <ascent12@hotmail.com>2017-10-21 17:37:25 +1300
committerScott Anderson <ascent12@hotmail.com>2017-10-22 10:36:07 +1300
commit822a9f65a4f965a7561de287013c2a5c159453ab (patch)
tree21093ceecc00b080f4285774848ed2ebf2ccf186 /backend
parent4ea84c5765b138153aa313f23288935192b75c42 (diff)
Add pointer to backend inside wlr_output
Diffstat (limited to 'backend')
-rw-r--r--backend/drm/drm.c2
-rw-r--r--backend/wayland/output.c2
-rw-r--r--backend/x11/backend.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index 0e898d3f..b3057166 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -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,
diff --git a/backend/wayland/output.c b/backend/wayland/output.c
index e1138ee1..0216823e 100644
--- a/backend/wayland/output.c
+++ b/backend/wayland/output.c
@@ -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;
diff --git a/backend/x11/backend.c b/backend/x11/backend.c
index 4ecca325..d30ec376 100644
--- a/backend/x11/backend.c
+++ b/backend/x11/backend.c
@@ -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);