mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-31 22:25:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Backport screenshooter fixes from the renderer redesign v1

Browse source 
This backports some changes to #319 to fix the screenshooter data
format. This also adds wlr_backend_get_renderer which will be
useful to support multiple renderers.
This commit is contained in:
emersion 2018-01-23 22:06:54 +01:00
parent 03440bbd83
commit 4fa90b0511
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
21 changed files with 178 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

7
backend/backend.c
View file

@ -52,6 +52,13 @@ struct wlr_egl *wlr_backend_get_egl(struct wlr_backend *backend) {
return NULL;
}
struct wlr_renderer *wlr_backend_get_renderer(struct wlr_backend *backend) {
if (backend->impl->get_renderer) {
return backend->impl->get_renderer(backend);
}
return NULL;
}
static struct wlr_backend *attempt_wl_backend(struct wl_display *display) {
struct wlr_backend *backend = wlr_wl_backend_create(display, NULL);
if (backend) {

9
backend/drm/backend.c
View file

@ -50,10 +50,17 @@ static struct wlr_egl *wlr_drm_backend_get_egl(struct wlr_backend *backend) {
return &drm->renderer.egl;
}
static struct wlr_renderer *wlr_drm_backend_get_renderer(
struct wlr_backend *backend) {
struct wlr_drm_backend *drm = (struct wlr_drm_backend *)backend;
return drm->renderer.wlr_rend;
}
static struct wlr_backend_impl backend_impl = {
.start = wlr_drm_backend_start,
.destroy = wlr_drm_backend_destroy,
.get_egl = wlr_drm_backend_get_egl
.get_egl = wlr_drm_backend_get_egl,
.get_renderer = wlr_drm_backend_get_renderer,
};
bool wlr_backend_is_drm(struct wlr_backend *b) {

17
backend/headless/backend.c
View file

@ -1,6 +1,6 @@
#include <stdlib.h>
#include <EGL/egl.h>
#include <EGL/eglext.h>
#include <wlr/render/egl.h>
#include <wlr/render/gles2.h>
#include <wlr/util/log.h>
#include <wlr/interfaces/wlr_output.h>
#include <wlr/interfaces/wlr_input_device.h>
@ -61,10 +61,18 @@ static struct wlr_egl *backend_get_egl(struct wlr_backend *wlr_backend) {
return &backend->egl;
}
static struct wlr_renderer *backend_get_renderer(
struct wlr_backend *wlr_backend) {
struct wlr_headless_backend *backend =
(struct wlr_headless_backend *)wlr_backend;
return backend->renderer;
}
static const struct wlr_backend_impl backend_impl = {
.start = backend_start,
.destroy = backend_destroy,
.get_egl = backend_get_egl,
.get_renderer = backend_get_renderer,
};
static void handle_display_destroy(struct wl_listener *listener, void *data) {
@ -103,6 +111,11 @@ struct wlr_backend *wlr_headless_backend_create(struct wl_display *display) {
return NULL;
}
backend->renderer = wlr_gles2_renderer_create(&backend->backend);
if (backend->renderer == NULL) {
wlr_log(L_ERROR, "Failed to create renderer");
}
backend->display_destroy.notify = handle_display_destroy;
wl_display_add_destroy_listener(display, &backend->display_destroy);

14
backend/multi/backend.c
View file

@ -62,10 +62,24 @@ static struct wlr_egl *multi_backend_get_egl(struct wlr_backend *wlr_backend) {
return NULL;
}
static struct wlr_renderer *multi_backend_get_renderer(
struct wlr_backend *backend) {
struct wlr_multi_backend *multi = (struct wlr_multi_backend *)backend;
struct subbackend_state *sub;
wl_list_for_each(sub, &multi->backends, link) {
struct wlr_renderer *rend = wlr_backend_get_renderer(sub->backend);
if (rend != NULL) {
return rend;
}
}
return NULL;
}
struct wlr_backend_impl backend_impl = {
.start = multi_backend_start,
.destroy = multi_backend_destroy,
.get_egl = multi_backend_get_egl,
.get_renderer = multi_backend_get_renderer,
};
static void handle_display_destroy(struct wl_listener *listener, void *data) {

22
backend/wayland/backend.c
View file

@ -6,6 +6,7 @@
#include <EGL/eglext.h>
#include <wayland-server.h>
#include <wlr/render/egl.h>
#include <wlr/render/gles2.h>
#include <wlr/backend/interface.h>
#include <wlr/interfaces/wlr_output.h>
#include <wlr/interfaces/wlr_input_device.h>
@ -106,15 +107,22 @@ static void wlr_wl_backend_destroy(struct wlr_backend *_backend) {
free(backend);
}
static struct wlr_egl *wlr_wl_backend_get_egl(struct wlr_backend *_backend) {
struct wlr_wl_backend *backend = (struct wlr_wl_backend *)_backend;
static struct wlr_egl *wlr_wl_backend_get_egl(struct wlr_backend *wlr_backend) {
struct wlr_wl_backend *backend = (struct wlr_wl_backend *)wlr_backend;
return &backend->egl;
}
static struct wlr_renderer *wlr_wl_backend_get_renderer(
struct wlr_backend *wlr_backend) {
struct wlr_wl_backend *backend = (struct wlr_wl_backend *)wlr_backend;
return backend->renderer;
}
static struct wlr_backend_impl backend_impl = {
.start = wlr_wl_backend_start,
.destroy = wlr_wl_backend_destroy,
.get_egl = wlr_wl_backend_get_egl
.get_egl = wlr_wl_backend_get_egl,
.get_renderer = wlr_wl_backend_get_renderer,
};
bool wlr_backend_is_wl(struct wlr_backend *b) {
@ -191,7 +199,8 @@ struct wlr_backend *wlr_wl_backend_create(struct wl_display *display, const char
return false;
}
if (!(backend->registry = wl_display_get_registry(backend->remote_display))) {
backend->registry = wl_display_get_registry(backend->remote_display);
if (backend->registry == NULL) {
wlr_log_errno(L_ERROR, "Could not obtain reference to remote registry");
return false;
}
@ -200,6 +209,11 @@ struct wlr_backend *wlr_wl_backend_create(struct wl_display *display, const char
backend->remote_display, NULL, WL_SHM_FORMAT_ARGB8888);
wlr_egl_bind_display(&backend->egl, backend->local_display);
backend->renderer = wlr_gles2_renderer_create(&backend->backend);
if (backend->renderer == NULL) {
wlr_log_errno(L_ERROR, "Could not create renderer");
}
backend->local_display_destroy.notify = handle_display_destroy;
wl_display_add_destroy_listener(display, &backend->local_display_destroy);

17
backend/x11/backend.c
View file

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