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 /include/backend | |
| parent | 169b68b17c668fc6d3feec92f3cf72308ba4e99c (diff) | |
| parent | d4e311a1adeee7cfd2a4404d716f3e0237ead607 (diff) | |
| download | wlroots-16f35ecbeacd685e7d9905a7867d8c950e369f2e.tar.xz | |
Merge branch 'master' into heghe/wl_list
Diffstat (limited to 'include/backend')
| -rw-r--r-- | include/backend/drm/drm.h | 5 | ||||
| -rw-r--r-- | include/backend/wayland.h | 2 | ||||
| -rw-r--r-- | include/backend/x11.h | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 0f19c01e..4d23f963 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -13,7 +13,8 @@ #include <wlr/backend/session.h> #include <wlr/backend/drm.h> #include <wlr/types/wlr_output.h> -#include <wlr/egl.h> +#include <wlr/render/egl.h> +#include <wlr/types/wlr_list.h> #include "iface.h" #include "properties.h" @@ -30,7 +31,6 @@ struct wlr_drm_plane { // Only used by cursor float matrix[16]; - struct wlr_renderer *wlr_rend; struct wlr_texture *wlr_tex; struct gbm_bo *cursor_bo; @@ -113,7 +113,6 @@ struct wlr_drm_mode { struct wlr_drm_connector { struct wlr_output output; - struct wlr_drm_backend *drm; enum wlr_drm_connector_state state; uint32_t id; diff --git a/include/backend/wayland.h b/include/backend/wayland.h index bc3b6277..e1c89b11 100644 --- a/include/backend/wayland.h +++ b/include/backend/wayland.h @@ -5,7 +5,7 @@ #include <wayland-client.h> #include <wayland-server.h> #include <wayland-egl.h> -#include <wlr/egl.h> +#include <wlr/render/egl.h> #include <wlr/backend/wayland.h> #include <wlr/types/wlr_output.h> #include <wlr/types/wlr_input_device.h> diff --git a/include/backend/x11.h b/include/backend/x11.h index b4284b63..f5ec56bc 100644 --- a/include/backend/x11.h +++ b/include/backend/x11.h @@ -5,7 +5,7 @@ #include <xcb/xcb.h> #include <X11/Xlib-xcb.h> #include <wayland-server.h> -#include <wlr/egl.h> +#include <wlr/render/egl.h> #include <wlr/types/wlr_output.h> #include <wlr/types/wlr_input_device.h> |