Skip to content

Commit

Permalink
Drop wl_drm again
Browse files Browse the repository at this point in the history
In [1] we re-introduced a debug flag to enable wl_drm. Time has
passed and Xwayland + VA-API + amdvlk now all support
linux-dmabuf-v1.

[1]: #7916
  • Loading branch information
emersion committed Jul 13, 2024
1 parent 274a5fc commit 1737b72
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 6 deletions.
1 change: 0 additions & 1 deletion include/sway/server.h
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ struct sway_debug {
bool noatomic; // Ignore atomic layout updates
bool txn_timings; // Log verbose messages about transactions
bool txn_wait; // Always wait for the timeout before applying
bool legacy_wl_drm; // Enable the legacy wl_drm interface
};

extern struct sway_debug debug;
Expand Down
2 changes: 0 additions & 2 deletions sway/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,6 @@ void enable_debug_flag(const char *flag) {
debug.txn_timings = true;
} else if (strncmp(flag, "txn-timeout=", 12) == 0) {
server.txn_timeout_ms = atoi(&flag[12]);
} else if (strcmp(flag, "legacy-wl-drm") == 0) {
debug.legacy_wl_drm = true;
} else {
sway_log(SWAY_ERROR, "Unknown debug flag: %s", flag);
}
Expand Down
3 changes: 0 additions & 3 deletions sway/server.c
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,6 @@ bool server_init(struct sway_server *server) {
if (wlr_renderer_get_texture_formats(server->renderer, WLR_BUFFER_CAP_DMABUF) != NULL) {
server->linux_dmabuf_v1 = wlr_linux_dmabuf_v1_create_with_renderer(
server->wl_display, 4, server->renderer);
if (debug.legacy_wl_drm) {
wlr_drm_create(server->wl_display, server->renderer);
}
}

server->allocator = wlr_allocator_autocreate(server->backend,
Expand Down

0 comments on commit 1737b72

Please sign in to comment.