From 2f1191461349f29c0c6b995ad98c2dde7927ba9b Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Sat, 16 Jan 2021 22:26:44 +0100 Subject: [PATCH] render: introduce private wlr_renderer_autocreate_with_drm_fd --- include/render/wlr_renderer.h | 4 ++++ render/wlr_renderer.c | 20 ++++++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/include/render/wlr_renderer.h b/include/render/wlr_renderer.h index 9e41f86f..dab9fd12 100644 --- a/include/render/wlr_renderer.h +++ b/include/render/wlr_renderer.h @@ -3,6 +3,10 @@ #include +/** + * Automatically select and create a renderer suitable for the DRM FD. + */ +struct wlr_renderer *wlr_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 3c757430..4a565b1d 100644 --- a/render/wlr_renderer.c +++ b/render/wlr_renderer.c @@ -250,14 +250,8 @@ bool wlr_renderer_init_wl_display(struct wlr_renderer *r, return true; } -struct wlr_renderer *wlr_renderer_autocreate(struct wlr_backend *backend) { - int fd = backend_get_drm_fd(backend); - if (fd < 0) { - wlr_log(WLR_ERROR, "Failed to get DRM FD from backend"); - return NULL; - } - - struct gbm_device *gbm_device = gbm_create_device(fd); +struct wlr_renderer *wlr_renderer_autocreate_with_drm_fd(int drm_fd) { + struct gbm_device *gbm_device = gbm_create_device(drm_fd); if (!gbm_device) { wlr_log(WLR_ERROR, "Failed to create GBM device"); return NULL; @@ -282,6 +276,16 @@ struct wlr_renderer *wlr_renderer_autocreate(struct wlr_backend *backend) { return renderer; } +struct wlr_renderer *wlr_renderer_autocreate(struct wlr_backend *backend) { + int drm_fd = backend_get_drm_fd(backend); + if (drm_fd < 0) { + wlr_log(WLR_ERROR, "Failed to get DRM FD from backend"); + return NULL; + } + + return wlr_renderer_autocreate_with_drm_fd(drm_fd); +} + int wlr_renderer_get_drm_fd(struct wlr_renderer *r) { if (!r->impl->get_drm_fd) { return -1;