aboutsummaryrefslogtreecommitdiff
path: root/backend/x11
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-01-29 23:24:09 +0100
committeremersion <contact@emersion.fr>2018-01-29 23:24:09 +0100
commit51c22d39a4a1a3c4ecfe39ee3df90ba7e66633af (patch)
treeb9fd9fd6fddc8a869f3500bf92944b47c01c578c /backend/x11
parent2cc989e09716eed5974dc9a76b7b6dbee9c3d730 (diff)
parented5b1fdedd775a7acec3d6814cc2ac007e34fd29 (diff)
Merge remote-tracking branch 'upstream/master' into output-damage
Diffstat (limited to 'backend/x11')
-rw-r--r--backend/x11/backend.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/backend/x11/backend.c b/backend/x11/backend.c
index ae7c13be..3bad8d61 100644
--- a/backend/x11/backend.c
+++ b/backend/x11/backend.c
@@ -16,6 +16,7 @@
#include <wlr/backend/interface.h>
#include <wlr/backend/x11.h>
#include <wlr/render/egl.h>
+#include <wlr/render/gles2.h>
#include <wlr/interfaces/wlr_output.h>
#include <wlr/interfaces/wlr_input_device.h>
#include <wlr/interfaces/wlr_keyboard.h>
@@ -272,16 +273,23 @@ static struct wlr_egl *wlr_x11_backend_get_egl(struct wlr_backend *backend) {
return &x11->egl;
}
-bool wlr_backend_is_x11(struct wlr_backend *backend) {
- return backend->impl == &backend_impl;
+static struct wlr_renderer *wlr_x11_backend_get_renderer(
+ struct wlr_backend *backend) {
+ struct wlr_x11_backend *x11 = (struct wlr_x11_backend *)backend;
+ return x11->renderer;
}
static struct wlr_backend_impl backend_impl = {
.start = wlr_x11_backend_start,
.destroy = wlr_x11_backend_destroy,
.get_egl = wlr_x11_backend_get_egl,
+ .get_renderer = wlr_x11_backend_get_renderer,
};
+bool wlr_backend_is_x11(struct wlr_backend *backend) {
+ return backend->impl == &backend_impl;
+}
+
static void handle_display_destroy(struct wl_listener *listener, void *data) {
struct wlr_x11_backend *x11 =
wl_container_of(listener, x11, display_destroy);
@@ -330,6 +338,11 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display,
goto error_event;
}
+ x11->renderer = wlr_gles2_renderer_create(&x11->backend);
+ if (x11->renderer == NULL) {
+ wlr_log(L_ERROR, "Failed to create renderer");
+ }
+
wlr_input_device_init(&x11->keyboard_dev, WLR_INPUT_DEVICE_KEYBOARD,
&input_device_impl, "X11 keyboard", 0, 0);
wlr_keyboard_init(&x11->keyboard, NULL);