Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

river: drop wl_drm support

Browse Source 
Looks like other compositors have completely dropped this by now.
This commit is contained in:
Isaac Freund 2025-04-27 12:55:14 +02:00
parent bbb62ac8d8
commit c111fc9905
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
river/Server.zig
View File

@ -61,7 +61,6 @@ allocator: *wlr.Allocator,
security_context_manager: *wlr.SecurityContextManagerV1, security_context_manager: *wlr.SecurityContextManagerV1,
shm: *wlr.Shm, shm: *wlr.Shm,
drm: ?*wlr.Drm = null,
linux_dmabuf: ?*wlr.LinuxDmabufV1 = null, linux_dmabuf: ?*wlr.LinuxDmabufV1 = null,
linux_drm_syncobj_manager: ?*wlr.LinuxDrmSyncobjManagerV1 = null, linux_drm_syncobj_manager: ?*wlr.LinuxDrmSyncobjManagerV1 = null,
single_pixel_buffer_manager: *wlr.SinglePixelBufferManagerV1, 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) { 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); server.linux_dmabuf = try wlr.LinuxDmabufV1.createWithRenderer(wl_server, 4, renderer);
} }
if (renderer.features.timeline and backend.features.timeline) { 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 /// Returns true if the global is allowlisted for security contexts
fn allowlist(server: *Server, global: *const wl.Global) bool { 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 (server.linux_dmabuf) |linux_dmabuf| {
if (global == linux_dmabuf.global) return true; if (global == linux_dmabuf.global) return true;
} }