From e1525a20c8cb0afbeadf368281117bb0589b15f0 Mon Sep 17 00:00:00 2001 From: Jente Hidskes Date: Fri, 28 Dec 2018 15:32:07 +0100 Subject: [PATCH] Do not create a dmabuf global In new enough wlroots versions, the renderer creates the dmabuf global itself. Fixes #11. --- cage.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/cage.c b/cage.c index eae44bb..5ce1a6d 100644 --- a/cage.c +++ b/cage.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -681,7 +680,6 @@ main(int argc, char *argv[]) struct wl_event_loop *event_loop = NULL; struct wlr_renderer *renderer = NULL; struct wlr_compositor *compositor = NULL; - struct wlr_linux_dmabuf_v1 *dmabuf = NULL; struct wlr_data_device_manager *data_device_mgr = NULL; struct wlr_xdg_shell *xdg_shell = NULL; int ret = 0; @@ -731,13 +729,6 @@ main(int argc, char *argv[]) goto end; } - dmabuf = wlr_linux_dmabuf_v1_create(server.wl_display, renderer); - if (!dmabuf) { - wlr_log(WLR_ERROR, "Unable to create the linux-dmabuf interface"); - ret = 1; - goto end; - } - data_device_mgr = wlr_data_device_manager_create(server.wl_display); if (!data_device_mgr) { wlr_log(WLR_ERROR, "Unable to create the data device manager"); @@ -826,7 +817,6 @@ end: } wlr_xdg_shell_destroy(xdg_shell); wlr_data_device_manager_destroy(data_device_mgr); - wlr_linux_dmabuf_v1_destroy(dmabuf); wlr_compositor_destroy(compositor); wlr_output_layout_destroy(server.output_layout); wlr_backend_destroy(server.backend);