diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-10-21 22:03:29 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2017-10-21 22:03:48 -0400 |
| commit | 16f35ecbeacd685e7d9905a7867d8c950e369f2e (patch) | |
| tree | c9cd07e837b454ff227fde4d7511a98c805bca27 /backend/x11 | |
| parent | 169b68b17c668fc6d3feec92f3cf72308ba4e99c (diff) | |
| parent | d4e311a1adeee7cfd2a4404d716f3e0237ead607 (diff) | |
Merge branch 'master' into heghe/wl_list
Diffstat (limited to 'backend/x11')
| -rw-r--r-- | backend/x11/backend.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backend/x11/backend.c b/backend/x11/backend.c index 11dd8568..d30ec376 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -15,7 +15,7 @@ #endif #include <wlr/backend/interface.h> #include <wlr/backend/x11.h> -#include <wlr/egl.h> +#include <wlr/render/egl.h> #include <wlr/interfaces/wlr_output.h> #include <wlr/interfaces/wlr_input_device.h> #include <wlr/interfaces/wlr_keyboard.h> @@ -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); |