diff options
author | emersion <contact@emersion.fr> | 2018-01-29 23:24:09 +0100 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2018-01-29 23:24:09 +0100 |
commit | 51c22d39a4a1a3c4ecfe39ee3df90ba7e66633af (patch) | |
tree | b9fd9fd6fddc8a869f3500bf92944b47c01c578c /include/backend | |
parent | 2cc989e09716eed5974dc9a76b7b6dbee9c3d730 (diff) | |
parent | ed5b1fdedd775a7acec3d6814cc2ac007e34fd29 (diff) |
Merge remote-tracking branch 'upstream/master' into output-damage
Diffstat (limited to 'include/backend')
-rw-r--r-- | include/backend/headless.h | 1 | ||||
-rw-r--r-- | include/backend/wayland.h | 2 | ||||
-rw-r--r-- | include/backend/x11.h | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/include/backend/headless.h b/include/backend/headless.h index f1948c07..f9805bcc 100644 --- a/include/backend/headless.h +++ b/include/backend/headless.h @@ -7,6 +7,7 @@ struct wlr_headless_backend { struct wlr_backend backend; struct wlr_egl egl; + struct wlr_renderer *renderer; struct wl_display *display; struct wl_list outputs; struct wl_list input_devices; diff --git a/include/backend/wayland.h b/include/backend/wayland.h index e14e000c..78a88f29 100644 --- a/include/backend/wayland.h +++ b/include/backend/wayland.h @@ -6,6 +6,7 @@ #include <wayland-server.h> #include <wayland-egl.h> #include <wlr/render/egl.h> +#include <wlr/render.h> #include <wlr/backend/wayland.h> #include <wlr/types/wlr_box.h> #include <wayland-util.h> @@ -19,6 +20,7 @@ struct wlr_wl_backend { struct wl_list devices; struct wl_list outputs; struct wlr_egl egl; + struct wlr_renderer *renderer; size_t requested_outputs; struct wl_listener local_display_destroy; /* remote state */ diff --git a/include/backend/x11.h b/include/backend/x11.h index b342cd4d..fee39eac 100644 --- a/include/backend/x11.h +++ b/include/backend/x11.h @@ -39,6 +39,7 @@ struct wlr_x11_backend { struct wlr_input_device pointer_dev; struct wlr_egl egl; + struct wlr_renderer *renderer; struct wl_event_source *event_source; struct wl_event_source *frame_timer; |