mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-01 22:58:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into output-damage

Browse source
This commit is contained in:
emersion 2018-01-29 23:24:09 +01:00
commit 51c22d39a4
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
22 changed files with 187 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/backend/headless.h
View file

@ -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;

2
include/backend/wayland.h
View file

@ -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 */

1
include/backend/x11.h
View file

@ -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;