aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsaac Freund <mail@isaacfreund.com>2024-01-06 19:23:55 -0600
committerIsaac Freund <mail@isaacfreund.com>2024-01-06 19:23:55 -0600
commitafbc84c994ee72f05362f25b28837c2f3ed0d980 (patch)
tree8e3f312e0389efcaebcc6b0e73c4f3bea4768d95
parent3605a46bb520313945e0417e1ae8be17b344e6df (diff)
downloadriver-afbc84c994ee72f05362f25b28837c2f3ed0d980.tar.gz
river-afbc84c994ee72f05362f25b28837c2f3ed0d980.tar.xz
river: re-add wl_drm support for now
It seems to be a bit too early to drop support for this legacy protocol. Xwayland apparently still relies on it for hardware acceleration as do fairly recent mesa versions still in widespread use.
m---------deps/zig-wlroots0
-rw-r--r--river/Server.zig6
2 files changed, 6 insertions, 0 deletions
diff --git a/deps/zig-wlroots b/deps/zig-wlroots
-Subproject 68ce60769c6a8019c43de35197f4596eaac4df4
+Subproject aae7f237e270ed8fc2ff10f3a661ced618c527c
diff --git a/river/Server.zig b/river/Server.zig
index e1c8036..0922cfd 100644
--- a/river/Server.zig
+++ b/river/Server.zig
@@ -102,6 +102,12 @@ pub fn init(self: *Self) !void {
try self.renderer.initWlShm(self.wl_server);
if (self.renderer.getDmabufFormats() != null and self.renderer.getDrmFd() >= 0) {
+ // 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
+ _ = try wlr.Drm.create(self.wl_server, self.renderer);
+
self.linux_dmabuf = try wlr.LinuxDmabufV1.createWithRenderer(self.wl_server, 4, self.renderer);
}