diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-08-10 22:20:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-10 22:20:21 -0400 |
| commit | 6569c2b62614384b268eb20feb7818f3c0cf606c (patch) | |
| tree | 4be63a8f4e2edfcecd228f23e9846403ddf39281 /include/backend | |
| parent | fe2fbd0fad96624ab64a86b0b8eb8ead769908f2 (diff) | |
| parent | c24351681f672a2ce561b9cb6d73172dfc36c45c (diff) | |
| download | wlroots-6569c2b62614384b268eb20feb7818f3c0cf606c.tar.xz | |
Merge pull request #53 from nyorain/drm_buffer
Implement drm (egl) buffer attaching
Diffstat (limited to 'include/backend')
| -rw-r--r-- | include/backend/drm.h | 2 | ||||
| -rw-r--r-- | include/backend/egl.h | 18 | ||||
| -rw-r--r-- | include/backend/wayland.h | 2 |
3 files changed, 2 insertions, 20 deletions
diff --git a/include/backend/drm.h b/include/backend/drm.h index 2f724524..35265e21 100644 --- a/include/backend/drm.h +++ b/include/backend/drm.h @@ -12,9 +12,9 @@ #include <wlr/backend/session.h> #include <wlr/backend/drm.h> +#include <wlr/egl.h> #include <wlr/util/list.h> -#include <backend/egl.h> #include <backend/udev.h> #include "drm-properties.h" diff --git a/include/backend/egl.h b/include/backend/egl.h deleted file mode 100644 index 0422a52b..00000000 --- a/include/backend/egl.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef WLR_BACKEND_EGL_H -#define WLR_BACKEND_EGL_H - -#include <EGL/egl.h> -#include <stdbool.h> - -struct wlr_egl { - EGLDisplay display; - EGLConfig config; - EGLContext context; -}; - -const char *egl_error(void); -bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, void *display); -void wlr_egl_free(struct wlr_egl *egl); -EGLSurface wlr_egl_create_surface(struct wlr_egl *egl, void *window); - -#endif diff --git a/include/backend/wayland.h b/include/backend/wayland.h index 792bad37..e6339a23 100644 --- a/include/backend/wayland.h +++ b/include/backend/wayland.h @@ -4,10 +4,10 @@ #include <wayland-client.h> #include <wayland-server.h> #include <wayland-egl.h> +#include <wlr/egl.h> #include <wlr/backend/wayland.h> #include <wlr/types/wlr_input_device.h> #include <wlr/util/list.h> -#include "backend/egl.h" struct wlr_backend_state { /* local state */ |