Skip to content

Commit 1737b72

Browse files
committed
Drop wl_drm again
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
1 parent 274a5fc commit 1737b72

File tree

3 files changed

+0
-6
lines changed

3 files changed

+0
-6
lines changed

include/sway/server.h

-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ struct sway_debug {
145145
bool noatomic; // Ignore atomic layout updates
146146
bool txn_timings; // Log verbose messages about transactions
147147
bool txn_wait; // Always wait for the timeout before applying
148-
bool legacy_wl_drm; // Enable the legacy wl_drm interface
149148
};
150149

151150
extern struct sway_debug debug;

sway/main.c

-2
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,6 @@ void enable_debug_flag(const char *flag) {
161161
debug.txn_timings = true;
162162
} else if (strncmp(flag, "txn-timeout=", 12) == 0) {
163163
server.txn_timeout_ms = atoi(&flag[12]);
164-
} else if (strcmp(flag, "legacy-wl-drm") == 0) {
165-
debug.legacy_wl_drm = true;
166164
} else {
167165
sway_log(SWAY_ERROR, "Unknown debug flag: %s", flag);
168166
}

sway/server.c

-3
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,6 @@ bool server_init(struct sway_server *server) {
244244
if (wlr_renderer_get_texture_formats(server->renderer, WLR_BUFFER_CAP_DMABUF) != NULL) {
245245
server->linux_dmabuf_v1 = wlr_linux_dmabuf_v1_create_with_renderer(
246246
server->wl_display, 4, server->renderer);
247-
if (debug.legacy_wl_drm) {
248-
wlr_drm_create(server->wl_display, server->renderer);
249-
}
250247
}
251248

252249
server->allocator = wlr_allocator_autocreate(server->backend,

0 commit comments

Comments
 (0)