git.lucas.co / cce-compositor
Wayland compositor (wlroots)
git clone https://git.lucas.co/cce-compositor.git

commitcc1a8599c918e9d2c7a1ef416e1f192d58bcf95b
parent9ac941a8fa
authorIsaac Freund <[email protected]>
date2025-04-27 12:55
river: drop wl_drm support

Looks like other compositors have completely dropped this by now.

(cherry picked from commit c111fc9905f0e97ddbc512cda1dd185f2b53e23a)

 river/Server.zig | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/river/Server.zig b/river/Server.zig
index 93d43d4..74260a9 100644
--- a/river/Server.zig
+++ b/river/Server.zig
@@ -59,7 +59,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,
@@ -159,12 +158,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) {
@@ -276,7 +269,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;
     }