From c111fc9905f0e97ddbc512cda1dd185f2b53e23a Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Sun, 27 Apr 2025 12:55:14 +0200 Subject: [PATCH] river: drop wl_drm support Looks like other compositors have completely dropped this by now. --- river/Server.zig | 8 -------- 1 file changed, 8 deletions(-) diff --git a/river/Server.zig b/river/Server.zig index 2c065d5..58c7eb6 100644 --- a/river/Server.zig +++ b/river/Server.zig @@ -61,7 +61,6 @@ allocator: *wlr.Allocator, security_context_manager: *wlr.SecurityContextManagerV1, shm: *wlr.Shm, -drm: ?*wlr.Drm = null, linux_dmabuf: ?*wlr.LinuxDmabufV1 = null, linux_drm_syncobj_manager: ?*wlr.LinuxDrmSyncobjManagerV1 = null, single_pixel_buffer_manager: *wlr.SinglePixelBufferManagerV1, @@ -181,12 +180,6 @@ pub fn init(server: *Server, runtime_xwayland: bool) !void { }; if (renderer.getTextureFormats(@intFromEnum(wlr.BufferCap.dmabuf)) != null) { - // wl_drm is a legacy interface and all clients should switch to linux_dmabuf. - // However, enough widely used clients still rely on wl_drm that the pragmatic option - // is to keep it around for the near future. - // TODO remove wl_drm support - server.drm = try wlr.Drm.create(wl_server, renderer); - server.linux_dmabuf = try wlr.LinuxDmabufV1.createWithRenderer(wl_server, 4, renderer); } if (renderer.features.timeline and backend.features.timeline) { @@ -302,7 +295,6 @@ fn globalFilter(client: *const wl.Client, global: *const wl.Global, server: *Ser /// Returns true if the global is allowlisted for security contexts fn allowlist(server: *Server, global: *const wl.Global) bool { - if (server.drm) |drm| if (global == drm.global) return true; if (server.linux_dmabuf) |linux_dmabuf| { if (global == linux_dmabuf.global) return true; }