diff options
author | Simon Ser <contact@emersion.fr> | 2020-12-19 11:34:28 +0100 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2020-12-30 17:09:40 +0100 |
commit | 4b03bdc3ab0cb1a0296c4d48b125f15a07ca99bd (patch) | |
tree | ba92975fc0f6c3fe7d62bbf2af120ea865383e77 /backend/drm | |
parent | bec1e6b149eb6a5eb470dd4eee6ba0aa57f1b590 (diff) | |
download | wlroots-4b03bdc3ab0cb1a0296c4d48b125f15a07ca99bd.tar.xz |
Remove wlr_create_renderer_func_t
This callback allowed compositors to customize the EGL config used by
the renderer. However with renderer v6 EGL configs aren't used anymore.
Instead, buffers are allocated via GBM and GL FBOs are rendered to. So
customizing the EGL config is a no-op.
Diffstat (limited to 'backend/drm')
-rw-r--r-- | backend/drm/backend.c | 5 | ||||
-rw-r--r-- | backend/drm/renderer.c | 8 |
2 files changed, 4 insertions, 9 deletions
diff --git a/backend/drm/backend.c b/backend/drm/backend.c index 5e0f9bcb..27f9d045 100644 --- a/backend/drm/backend.c +++ b/backend/drm/backend.c @@ -128,8 +128,7 @@ static void handle_display_destroy(struct wl_listener *listener, void *data) { struct wlr_backend *wlr_drm_backend_create(struct wl_display *display, struct wlr_session *session, struct wlr_device *dev, - struct wlr_backend *parent, - wlr_renderer_create_func_t create_renderer_func) { + struct wlr_backend *parent) { assert(display && session && dev); assert(!parent || wlr_backend_is_drm(parent)); @@ -179,7 +178,7 @@ struct wlr_backend *wlr_drm_backend_create(struct wl_display *display, goto error_event; } - if (!init_drm_renderer(drm, &drm->renderer, create_renderer_func)) { + if (!init_drm_renderer(drm, &drm->renderer)) { wlr_log(WLR_ERROR, "Failed to initialize renderer"); goto error_event; } diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c index dd991dce..ebba3bb6 100644 --- a/backend/drm/renderer.c +++ b/backend/drm/renderer.c @@ -21,7 +21,7 @@ #include "render/wlr_renderer.h" bool init_drm_renderer(struct wlr_drm_backend *drm, - struct wlr_drm_renderer *renderer, wlr_renderer_create_func_t create_renderer_func) { + struct wlr_drm_renderer *renderer) { renderer->backend = drm; renderer->gbm = gbm_create_device(drm->fd); @@ -30,11 +30,7 @@ bool init_drm_renderer(struct wlr_drm_backend *drm, return false; } - if (!create_renderer_func) { - create_renderer_func = wlr_renderer_autocreate; - } - - renderer->wlr_rend = create_renderer_func(&renderer->egl, + renderer->wlr_rend = wlr_renderer_autocreate(&renderer->egl, EGL_PLATFORM_GBM_KHR, renderer->gbm, NULL, 0); if (!renderer->wlr_rend) { wlr_log(WLR_ERROR, "Failed to create EGL/WLR renderer"); |