From 619a9750251a1bff5bef7a1bcd22ee80a56a453f Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 29 Apr 2021 09:46:34 +0200 Subject: [PATCH] render: remove wlr_ prefix from wlr_renderer_autocreate_with_drm_fd This function is only required because the DRM backend still needs to perform multi-GPU magic under-the-hood. Remove the wlr_ prefix to make it clear it's not a candidate for being made public. --- backend/drm/renderer.c | 2 +- include/render/wlr_renderer.h | 2 +- render/wlr_renderer.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c index cebf8588..c19df83b 100644 --- a/backend/drm/renderer.c +++ b/backend/drm/renderer.c @@ -29,7 +29,7 @@ bool init_drm_renderer(struct wlr_drm_backend *drm, return false; } - renderer->wlr_rend = wlr_renderer_autocreate_with_drm_fd(drm->fd); + renderer->wlr_rend = renderer_autocreate_with_drm_fd(drm->fd); if (!renderer->wlr_rend) { wlr_log(WLR_ERROR, "Failed to create renderer"); goto error_gbm; diff --git a/include/render/wlr_renderer.h b/include/render/wlr_renderer.h index d09c20b3..9a16caed 100644 --- a/include/render/wlr_renderer.h +++ b/include/render/wlr_renderer.h @@ -6,7 +6,7 @@ /** * Automatically select and create a renderer suitable for the DRM FD. */ -struct wlr_renderer *wlr_renderer_autocreate_with_drm_fd(int drm_fd); +struct wlr_renderer *renderer_autocreate_with_drm_fd(int drm_fd); /** * Bind a buffer to the renderer. * diff --git a/render/wlr_renderer.c b/render/wlr_renderer.c index 853acec3..1fc23657 100644 --- a/render/wlr_renderer.c +++ b/render/wlr_renderer.c @@ -231,7 +231,7 @@ bool wlr_renderer_init_wl_display(struct wlr_renderer *r, return true; } -struct wlr_renderer *wlr_renderer_autocreate_with_drm_fd(int drm_fd) { +struct wlr_renderer *renderer_autocreate_with_drm_fd(int drm_fd) { const char *name = getenv("WLR_RENDERER"); if (name) { wlr_log(WLR_INFO, "Loading user-specified renderer due to WLR_RENDERER: %s", @@ -279,7 +279,7 @@ struct wlr_renderer *wlr_renderer_autocreate_with_drm_fd(int drm_fd) { struct wlr_renderer *wlr_renderer_autocreate(struct wlr_backend *backend) { // Note, drm_fd may be negative if unavailable int drm_fd = wlr_backend_get_drm_fd(backend); - return wlr_renderer_autocreate_with_drm_fd(drm_fd); + return renderer_autocreate_with_drm_fd(drm_fd); } int wlr_renderer_get_drm_fd(struct wlr_renderer *r) {