feat: upgrade smithay

Cargo.toml

@@ -58,10 +58,11 @@ tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
 global_counter = "0.2.2"
 rand = "0.8.5"
 atty = "0.2.14"
-xkbcommon = { version = "0.6.0", default-features = false, optional = true }
+xkbcommon = { version = "0.7.0", default-features = false, optional = true }
 ctrlc = "3.4.1"
 libc = "0.2.148"
 input-event-codes = "5.16.8"
+nix = "0.27.1"
 
 [dependencies.smithay]
 # git = "https://github.com/technobaboo/smithay.git" # Until we get stereokit to understand OES samplers and external textures

src/main.rs

@@ -19,7 +19,6 @@ use self::core::eventloop::EventLoop;
 use clap::Parser;
 use directories::ProjectDirs;
 use once_cell::sync::OnceCell;
-use smithay::reexports::nix;
 use stardust_xr::server;
 use std::os::unix::process::CommandExt;
 use std::path::PathBuf;

src/wayland/mod.rs

@@ -24,6 +24,7 @@ use smithay::backend::renderer::ImportDma;
 use smithay::reexports::wayland_server::backend::ClientId;
 use smithay::reexports::wayland_server::DisplayHandle;
 use smithay::reexports::wayland_server::{Display, ListeningSocket};
+use smithay::wayland::dmabuf;
 use std::ffi::OsStr;
 use std::os::fd::OwnedFd;
 use std::os::unix::prelude::AsRawFd;
@@ -86,7 +87,7 @@ pub struct Wayland {
 	pub socket_name: Option<String>,
 	join_handle: JoinHandle<Result<()>>,
 	renderer: GlesRenderer,
-	dmabuf_rx: UnboundedReceiver<Dmabuf>,
+	dmabuf_rx: UnboundedReceiver<(Dmabuf, dmabuf::ImportNotifier)>,
 	wayland_state: Arc<Mutex<WaylandState>>,
 	#[cfg(feature = "xwayland")]
 	pub xwayland_state: xwayland::XWaylandState,
@@ -180,8 +181,10 @@ impl Wayland {
 
 	#[instrument(level = "debug", name = "Wayland frame", skip(self, sk))]
 	pub fn update(&mut self, sk: &impl StereoKitDraw) {
-		while let Ok(dmabuf) = self.dmabuf_rx.try_recv() {
-			let _ = self.renderer.import_dmabuf(&dmabuf, None);
+		while let Ok((dmabuf, notifier)) = self.dmabuf_rx.try_recv() {
+			if self.renderer.import_dmabuf(&dmabuf, None).is_err() {
+				notifier.failed();
+			}
 		}
 		for core_surface in CORE_SURFACES.get_valid_contents() {
 			core_surface.process(sk, &mut self.renderer);