StardustXR/server
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases 5 Wiki Activity

refactor(wayland): remove manual dmabuf importing

Browse Source
This commit is contained in:
Nova
2022-12-09 06:59:28 -05:00
parent ac5e949614
commit 303b3f3ca2
3 changed files with 18 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/wayland/mod.rs
View File

@@ -8,7 +8,6 @@ mod state;
mod surface;
mod xdg_activation;
mod xdg_shell;
mod dmabuf;
use self::{panel_item::PanelItem, state::WaylandState, surface::CORE_SURFACES};
use crate::wayland::state::ClientState;
@@ -17,7 +16,7 @@ use once_cell::sync::OnceCell;
use parking_lot::Mutex;
use slog::Drain;
use smithay::{
backend::{egl::EGLContext, renderer::{gles2::Gles2Renderer, ImportDma}},
backend::{egl::EGLContext, renderer::{gles2::Gles2Renderer}},
reexports::wayland_server::{backend::GlobalId, Display, ListeningSocket, Resource},
};
use tracing::info;
@@ -153,10 +152,7 @@ impl Wayland {
.wl_surface()
.and_then(|surf| surf.client())
.map(|c| c.id()) else { continue };
let mut state = self.state.lock();
for dmabuf in state.pending_dmabufs.drain(..) {
let _ = self.renderer.import_dmabuf(&dmabuf, None);
}
let state = self.state.lock();
let Some(seat_data) = state.seats.get(&client_id).cloned() else { continue };
let output = state.output.clone();
core_surface.process(