Skip to content

Commit 74769ea

Browse files
committed
Remove wl_drm global
This isn't used except by ancient drivers and by Xwayland as a fallback; but Xwayland using it can be problematic in some cases like when importing a buffer with implicit modifiers since magic-mirror doesn't actually implement WlDrm
1 parent c750905 commit 74769ea

File tree

6 files changed

+0
-275
lines changed

6 files changed

+0
-275
lines changed

mm-server/src/session/compositor.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use std::{collections::BTreeMap, sync::Arc};
66

7-
use protocols::*;
87
use slotmap::SlotMap;
98
use tracing::{debug, instrument, trace};
109
use wayland_protocols::{
@@ -38,7 +37,6 @@ pub mod buffers;
3837
mod dispatch;
3938
mod oneshot_render;
4039
mod output;
41-
mod protocols;
4240
mod sealed;
4341
mod seat;
4442
mod serial;
@@ -295,7 +293,6 @@ pub fn create_globals(dh: &wayland_server::DisplayHandle) {
295293
create_global::<wp_linux_drm_syncobj_manager_v1::WpLinuxDrmSyncobjManagerV1>(dh, 1);
296294

297295
create_global::<xwayland_shell_v1::XwaylandShellV1>(dh, 1);
298-
create_global::<wl_drm::WlDrm>(dh, 2);
299296
}
300297

301298
fn create_global<G: wayland_server::Resource + 'static>(

mm-server/src/session/compositor/dispatch.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
mod wl_buffer;
66
mod wl_compositor;
77
mod wl_data_device_manager;
8-
mod wl_drm;
98
mod wl_output;
109
mod wl_seat;
1110
mod wl_shm;

mm-server/src/session/compositor/dispatch/wl_drm.rs

Lines changed: 0 additions & 57 deletions
This file was deleted.

mm-server/src/session/compositor/protocols.rs

Lines changed: 0 additions & 5 deletions
This file was deleted.

mm-server/src/session/compositor/protocols/wayland-drm.xml

Lines changed: 0 additions & 189 deletions
This file was deleted.

mm-server/src/session/compositor/protocols/wl_drm.rs

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)