mirrors/cage
1
0
Fork 0
mirror of https://github.com/cage-kiosk/cage.git synced 2026-03-16 05:34:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not create a dmabuf global

Browse source 
In new enough wlroots versions, the renderer creates the dmabuf global
itself.

Fixes #11.
This commit is contained in:
Jente Hidskes 2018-12-28 15:32:07 +01:00
parent f680ee02db
commit e1525a20c8
No known key found for this signature in database
GPG key ID: 04BE5A29F32D91EA
1 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cage.c
View file

@ -18,7 +18,6 @@
#include <wlr/types/wlr_cursor.h> #include <wlr/types/wlr_cursor.h>
#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_data_device.h> #include <wlr/types/wlr_data_device.h>
#include <wlr/types/wlr_linux_dmabuf_v1.h>
#include <wlr/types/wlr_matrix.h> #include <wlr/types/wlr_matrix.h>
#include <wlr/types/wlr_xcursor_manager.h> #include <wlr/types/wlr_xcursor_manager.h>
#include <wlr/types/wlr_xdg_shell.h> #include <wlr/types/wlr_xdg_shell.h>
@ -681,7 +680,6 @@ main(int argc, char *argv[])
struct wl_event_loop *event_loop = NULL; struct wl_event_loop *event_loop = NULL;
struct wlr_renderer *renderer = NULL; struct wlr_renderer *renderer = NULL;
struct wlr_compositor *compositor = NULL; struct wlr_compositor *compositor = NULL;
struct wlr_linux_dmabuf_v1 *dmabuf = NULL;
struct wlr_data_device_manager *data_device_mgr = NULL; struct wlr_data_device_manager *data_device_mgr = NULL;
struct wlr_xdg_shell *xdg_shell = NULL; struct wlr_xdg_shell *xdg_shell = NULL;
int ret = 0; int ret = 0;
@ -731,13 +729,6 @@ main(int argc, char *argv[])
goto end; 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); data_device_mgr = wlr_data_device_manager_create(server.wl_display);
if (!data_device_mgr) { if (!data_device_mgr) {
wlr_log(WLR_ERROR, "Unable to create the data device manager"); wlr_log(WLR_ERROR, "Unable to create the data device manager");
@ -826,7 +817,6 @@ end:
} }
wlr_xdg_shell_destroy(xdg_shell); wlr_xdg_shell_destroy(xdg_shell);
wlr_data_device_manager_destroy(data_device_mgr); wlr_data_device_manager_destroy(data_device_mgr);
wlr_linux_dmabuf_v1_destroy(dmabuf);
wlr_compositor_destroy(compositor); wlr_compositor_destroy(compositor);
wlr_output_layout_destroy(server.output_layout); wlr_output_layout_destroy(server.output_layout);
wlr_backend_destroy(server.backend); wlr_backend_destroy(server.backend);