mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-12-20 08:56:27 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

render: drop wlr_renderer_impl.init_wl_display

Browse source 
Now that we have our own wl_drm implementation, there's no reason
to provide custom renderer hooks to init a wl_display in the
interface. We can just initialize the wl_display generically,
depending on the renderer capabilities.
This commit is contained in:
Simon Ser 2021-07-22 19:47:51 +02:00 • committed by Simon Zeni
parent 70fb21c35b
commit 2fa47c1837
3 changed files with 12 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

14
render/wlr_renderer.c
View file

@ -4,6 +4,8 @@
#include <wlr/render/interface.h>
#include <wlr/render/pixman.h>
#include <wlr/render/wlr_renderer.h>
#include <wlr/types/wlr_drm.h>
#include <wlr/types/wlr_linux_dmabuf_v1.h>
#include <wlr/types/wlr_matrix.h>
#include <wlr/util/box.h>
#include <wlr/util/log.h>
@ -223,8 +225,16 @@ bool wlr_renderer_init_wl_display(struct wlr_renderer *r,
}
assert(argb8888 && xrgb8888);
if (r->impl->init_wl_display) {
if (!r->impl->init_wl_display(r, wl_display)) {
if (wlr_renderer_get_dmabuf_texture_formats(r) != NULL) {
if (wlr_renderer_get_drm_fd(r) >= 0) {
if (wlr_drm_create(wl_display, r) == NULL) {
return false;
}
} else {
wlr_log(WLR_INFO, "Cannot get renderer DRM FD, disabling wl_drm");
}
if (wlr_linux_dmabuf_v1_create(wl_display, r) == NULL) {
return false;
}
}