DComp Swapchains

Cargo.toml

@@ -3,12 +3,12 @@ resolver = "2"
 members = ["apps/cli", "apps/desktop/src-tauri", "crates/*"]
 
 [workspace.dependencies]
-anyhow = { version = "1.0.86" }
+anyhow = { version = "1.0.99" }
 # This includes a currently-unreleased fix that ensures the audio stream is actually
 # stopped and released on drop on macOS
 cpal = { git = "https://github.com/RustAudio/cpal", rev = "f43d36e55494993bbbde3299af0c53e5cdf4d4cf" }
 ffmpeg = { package = "ffmpeg-next", git = "https://github.com/CapSoftware/rust-ffmpeg", rev = "49db1fede112" }
-tokio = { version = "1.39.3", features = [
+tokio = { version = "1.47.1", features = [
     "macros",
     "process",
     "fs",
@@ -17,8 +17,8 @@ tokio = { version = "1.39.3", features = [
     "rt-multi-thread",
     "time",
 ] }
-tauri = { version = "2.5.0", features = ["specta"] }
-specta = { version = "=2.0.0-rc.20", features = [
+tauri = { version = "2.8.5", features = ["specta"] }
+specta = { version = "=2.0.0-rc.22", features = [
     "derive",
     "serde_json",
     "uuid",
@@ -31,10 +31,10 @@ nokhwa = { git = "https://github.com/CapSoftware/nokhwa", rev = "b9c8079e82e2",
     "serialize",
 ] }
 nokhwa-bindings-macos = { git = "https://github.com/CapSoftware/nokhwa", rev = "b9c8079e82e2" }
-wgpu = "25.0.0"
-flume = "0.11.0"
-thiserror = "1.0"
-sentry = { version = "0.34.0", features = [
+wgpu = "26.0.1"
+flume = "0.11.1"
+thiserror = "2.0"
+sentry = { version = "0.42.0", features = [
     "anyhow",
     "backtrace",
     "debug-images",
@@ -53,11 +53,11 @@ cidre = { git = "https://github.com/CapSoftware/cidre", rev = "bf84b67079a8", fe
     "dispatch",
 ], default-features = false }
 
-windows = "0.60.0"
-windows-core = "0.60"
-windows-sys = "0.59.0"
+windows = "0.62.0"
+windows-core = "0.62"
+windows-sys = "0.61.0"
 windows-capture = "1.5.0"
-percent-encoding = "2.3.1"
+percent-encoding = "2.3.2"
 
 # TODO: Reenable these: https://github.com/CapSoftware/Cap/issues/859
 [workspace.lints.rust]
@@ -80,4 +80,7 @@ debug = true
 # screencapturekit = { git = "https://github.com/CapSoftware/screencapturekit-rs", rev = "7ff1e103742e56c8f6c2e940b5e52684ed0bed69" } # branch = "cap-main"
 cidre = { git = "https://github.com/CapSoftware/cidre", rev = "bf84b67079a8" }
 # https://github.com/gfx-rs/wgpu/pull/7550
-# wgpu = { git = "https://github.com/gfx-rs/wgpu", rev = "cd41a6e32a6239b65d1cecbeccde6a43a100914a" }
+wgpu = { git = "https://github.com/gfx-rs/wgpu", rev = "04a34016384963bf26353fad472b5d2c5ecdc359" }
+# `main` - For wgpu 26
+# https://github.com/brendanzab/codespan/issues/389#issuecomment-3157285757
+glyphon = { git = "https://github.com/grovesNL/glyphon.git", rev = "724ab57edbd6c59ba219cd99cf89925d056392db" }

apps/cli/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-clap = { version = "4.5.23", features = ["derive"] }
+clap = { version = "4.5.47", features = ["derive"] }
 cap-utils = { path = "../../crates/utils" }
 cap-project = { path = "../../crates/project" }
 cap-rendering = { path = "../../crates/rendering" }
@@ -16,12 +16,12 @@ cap-export = { path = "../../crates/export" }
 cap-camera = { path = "../../crates/camera" }
 scap-targets = { path = "../../crates/scap-targets" }
 serde = { workspace = true }
-serde_json = "1.0.133"
+serde_json = "1.0.144"
 tokio.workspace = true
-uuid = { version = "1.11.1", features = ["v4"] }
+uuid = { version = "1.18.1", features = ["v4"] }
 ffmpeg = { workspace = true }
 tracing.workspace = true
-tracing-subscriber = "0.3.19"
+tracing-subscriber = "0.3.20"
 flume.workspace = true
 
 [lints]

apps/desktop/src-tauri/Cargo.toml

@@ -13,10 +13,10 @@ name = "cap_desktop_lib"
 crate-type = ["lib", "cdylib", "staticlib"]
 
 [build-dependencies]
-tauri-build = { version = "2.1.0", features = [] }
+tauri-build = { version = "2.4.1", features = [] }
 
 [target.'cfg(target_os = "macos")'.build-dependencies]
-swift-rs = { version = "1.0.6", features = ["build"] }
+swift-rs = { version = "1.0.7", features = ["build"] }
 
 [dependencies]
 tauri = { workspace = true, features = [
@@ -26,57 +26,57 @@ tauri = { workspace = true, features = [
 	"image-png",
 	"devtools",
 ] }
-tauri-specta = { version = "=2.0.0-rc.20", features = ["derive", "typescript"] }
-tauri-plugin-dialog = "2.2.0"
-tauri-plugin-fs = "2.2.0"
-tauri-plugin-global-shortcut = "2.2.0"
-tauri-plugin-http = "2.2.0"
-tauri-plugin-notification = "2.2.0"
-tauri-plugin-os = "2.2.0"
-tauri-plugin-process = "2.2.0"
-tauri-plugin-shell = "2.2.0"
-tauri-plugin-single-instance = { version = "2.2.0", features = ["deep-link"] }
-tauri-plugin-store = "2.2.0"
+tauri-specta = { version = "=2.0.0-rc.21", features = ["derive", "typescript"] }
+tauri-plugin-dialog = "2.4.0"
+tauri-plugin-fs = "2.4.2"
+tauri-plugin-global-shortcut = "2.3.0"
+tauri-plugin-http = "2.5.2"
+tauri-plugin-notification = "2.3.1"
+tauri-plugin-os = "2.3.1"
+tauri-plugin-process = "2.3.0"
+tauri-plugin-shell = "2.3.1"
+tauri-plugin-single-instance = { version = "2.3.4", features = ["deep-link"] }
+tauri-plugin-store = "2.4.0"
 tauri-plugin-updater = "2.9.0"
 tauri-plugin-oauth = { git = "https://github.com/FabianLars/tauri-plugin-oauth", branch = "v2" }
-tauri-plugin-window-state = "2.2.0"
-tauri-plugin-positioner = "2.2.0"
-tauri-plugin-deep-link = "2.2.0"
-tauri-plugin-clipboard-manager = "2.2.1"
-tauri-plugin-opener = "2.2.6"
+tauri-plugin-window-state = "2.4.0"
+tauri-plugin-positioner = "2.3.0"
+tauri-plugin-deep-link = "2.4.3"
+tauri-plugin-clipboard-manager = "2.3.0"
+tauri-plugin-opener = "2.5.0"
 
 scap = { workspace = true }
 serde = { workspace = true }
-serde_json = "1.0.111"
+serde_json = "1.0.144"
 specta.workspace = true
-specta-typescript = "0.0.7"
+specta-typescript = "0.0.9"
 tokio.workspace = true
-uuid = { version = "1.10.0", features = ["v4"] }
-image = "0.25.2"
+uuid = { version = "1.18.1", features = ["v4"] }
+image = "0.25.8"
 mp4 = "0.14.0"
 futures-intrusive = "0.5.0"
 anyhow.workspace = true
 futures = { workspace = true }
-axum = { version = "0.7.5", features = ["ws", "macros"] }
+axum = { version = "0.8.4", features = ["ws", "macros"] }
 tracing.workspace = true
-tempfile = "3.9.0"
+tempfile = "3.22.0"
 ffmpeg.workspace = true
-chrono = { version = "0.4.31", features = ["serde"] }
-rodio = "0.19.0"
-png = "0.17.13"
+chrono = { version = "0.4.42", features = ["serde"] }
+rodio = "0.21.1"
+png = "0.18.0"
 device_query = "4.0.1"
 base64 = "0.22.1"
-reqwest = { version = "0.12.7", features = ["json", "stream", "multipart"] }
+reqwest = { version = "0.12.23", features = ["json", "stream", "multipart"] }
 dotenvy_macro = "0.15.7"
 global-hotkey = "0.7.0"
-rand = "0.8.5"
+rand = "0.9.2"
 cpal.workspace = true
 keyed_priority_queue = "0.4.2"
 sentry.workspace = true
-clipboard-rs = "0.2.2"
-whisper-rs = "0.11.0"
-lazy_static = "1.4.0"
-log = "0.4.20"
+clipboard-rs = "0.3.0"
+whisper-rs = "0.15.1"
+lazy_static = "1.5.0"
+log = "0.4.28"
 
 cap-audio = { path = "../../../crates/audio" }
 cap-camera = { path = "../../../crates/camera", features = ["serde", "specta"] }
@@ -91,29 +91,29 @@ cap-export = { path = "../../../crates/export" }
 scap-targets = { path = "../../../crates/scap-targets" }
 
 flume.workspace = true
-tracing-subscriber = "0.3.19"
+tracing-subscriber = "0.3.20"
 tracing-appender = "0.2.3"
 dirs = "6.0.0"
-relative-path = "1.9.3"
+relative-path = "2.0.1"
 cap-fail = { version = "0.1.0", path = "../../../crates/fail" }
 tokio-stream = { version = "0.1.17", features = ["sync"] }
-md5 = "0.7.0"
-tokio-util = "0.7.15"
+md5 = "0.8.0"
+tokio-util = "0.7.16"
 wgpu.workspace = true
-bytemuck = "1.23.1"
-kameo = "0.17.2"
+bytemuck = "1.23.2"
+kameo = "0.18.0"
 
 [target.'cfg(target_os = "macos")'.dependencies]
-core-graphics = "0.24.0"
-core-foundation = "0.10.0"
-objc2-app-kit = { version = "0.3.0", features = [
+core-graphics = "0.25.0"
+core-foundation = "0.10.1"
+objc2-app-kit = { version = "0.3.1", features = [
 	"NSWindow",
 	"NSResponder",
 	"NSHapticFeedback",
 ] }
-cocoa = "0.26.0"
+cocoa = "0.26.1"
 objc = "0.2.7"
-swift-rs = "1.0.6"
+swift-rs = "1.0.7"
 tauri-nspanel = { git = "https://github.com/ahkohd/tauri-nspanel", branch = "v2" }
 cidre = { workspace = true }
 
@@ -127,4 +127,4 @@ windows = { workspace = true, features = [
 windows-sys = { workspace = true }
 
 [target.'cfg(unix)'.dependencies]
-nix = { version = "0.29.0", features = ["fs"] }
+nix = { version = "0.30.1", features = ["fs"] }

apps/desktop/src-tauri/src/camera.rs

@@ -178,7 +178,16 @@ impl InitializedCameraPreview {
             .run_on_main_thread({
                 let window = window.clone();
                 move || {
-                    let instance = wgpu::Instance::default();
+                    let instance = wgpu::Instance::new(&wgpu::InstanceDescriptor {
+                        backend_options: wgpu::BackendOptions {
+                            dx12: wgpu::Dx12BackendOptions {
+                                // presentation_system: wgpu::Dx12SwapchainKind::DxgiFromVisual, // TODO
+                                ..Default::default()
+                            },
+                            ..Default::default()
+                        },
+                        ..Default::default()
+                    });
                     let surface = instance.create_surface(window.clone());
                     tx.send((instance, surface)).ok();
                 }

apps/desktop/src-tauri/src/frame_ws.rs

@@ -50,7 +50,7 @@ pub async fn create_frame_ws(frame_rx: Receiver<WSFrame>) -> (u16, CancellationT
                             frame.data.extend_from_slice(&frame.height.to_le_bytes());
                             frame.data.extend_from_slice(&frame.width.to_le_bytes());
 
-                            if let Err(e) = socket.send(Message::Binary(frame.data)).await {
+                            if let Err(e) = socket.send(Message::Binary(frame.data.into())).await {
                                 tracing::error!("Failed to send frame to socket: {:?}", e);
                                 break;
                             }

crates/camera-avfoundation/Cargo.toml

@@ -11,8 +11,8 @@ cidre = { workspace = true }
 workspace = true
 
 [dev-dependencies]
-clap = { version = "4.5.40", features = ["derive"] }
-inquire = "0.7.5"
+clap = { version = "4.5.47", features = ["derive"] }
+inquire = "0.8.0"
 
 [dependencies]
 tracing.workspace = true

crates/camera-directshow/Cargo.toml

@@ -24,6 +24,6 @@ windows = { workspace = true, features = [
 workspace = true
 
 [dev-dependencies]
-inquire = "0.7.5"
+inquire = "0.8.0"
 tracing.workspace = true
-tracing-subscriber = "0.3.19"
+tracing-subscriber = "0.3.20"

crates/camera-ffmpeg/Cargo.toml

@@ -19,7 +19,7 @@ windows-core = { workspace = true }
 cap-camera-windows = { path = "../camera-windows" }
 
 [dev-dependencies]
-inquire = "0.7.5"
+inquire = "0.8.0"
 
 [lints]
 workspace = true

crates/camera-mediafoundation/Cargo.toml

@@ -18,7 +18,7 @@ windows = { workspace = true, features = [
 ] }
 
 [dev-dependencies]
-inquire = "0.7.5"
+inquire = "0.8.0"
 
 [lints]
 workspace = true

crates/camera-windows/Cargo.toml

@@ -6,7 +6,7 @@ license = "MIT"
 
 [dependencies]
 thiserror.workspace = true
-inquire = "0.7.5"
+inquire = "0.8.0"
 
 [target.'cfg(windows)'.dependencies]
 cap-mediafoundation-utils = { path = "../mediafoundation-utils" }
@@ -20,4 +20,4 @@ windows-core = { workspace = true }
 workspace = true
 
 [dev-dependencies]
-inquire = "0.7.5"
+inquire = "0.8.0"

crates/camera/Cargo.toml

@@ -20,7 +20,7 @@ windows-core = { workspace = true }
 cap-camera-windows = { path = "../camera-windows" }
 
 [dev-dependencies]
-inquire = "0.7.5"
+inquire = "0.8.0"
 
 [lints]
 workspace = true

crates/cursor-capture/Cargo.toml

@@ -12,4 +12,4 @@ scap-targets = { path = "../scap-targets" }
 device_query = "4.0.1"
 
 [target.'cfg(target_os = "macos")'.dependencies]
-core-graphics = "0.24.0"
+core-graphics = "0.25.0"

crates/cursor-info/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2024"
 publish = false
 
 [dependencies]
-serde = { version = "1.0.219", features = ["derive"] }
+serde = { version = "1.0.221", features = ["derive"] }
 specta = { workspace = true, features = ["derive"] }
 strum = { version = "0.27.2", features = ["derive"] }
 
@@ -21,7 +21,7 @@ sha2 = "0.10"
 
 [target.'cfg(target_os = "macos")'.dev-dependencies]
 objc2 = "0.6"
-objc2-app-kit = { version = "0.3.0", features = ["NSCursor", "NSApplication"] }
+objc2-app-kit = { version = "0.3.1", features = ["NSCursor", "NSApplication"] }
 
 
 [lints]

crates/editor/Cargo.toml

@@ -15,13 +15,13 @@ cap-media-info = { path = "../media-info" }
 
 tokio = { workspace = true, features = ["macros", "process", "fs"] }
 cpal.workspace = true
-axum = { version = "0.7.5", features = ["ws"] }
+axum = { version = "0.8.4", features = ["ws"] }
 ffmpeg.workspace = true
 specta.workspace = true
 serde = { workspace = true }
 sentry.workspace = true
 futures = { workspace = true }
 tracing.workspace = true
 flume.workspace = true
-tokio-util = "0.7.15"
+tokio-util = "0.7.16"
 ringbuf = "0.4.8"

crates/enc-gif/Cargo.toml

@@ -6,8 +6,8 @@ edition = "2024"
 [dependencies]
 thiserror.workspace = true
 tracing.workspace = true
-gifski = "1.32"
-imgref = "1.10"
+gifski = "1.34"
+imgref = "1.11"
 rgb = "0.8"
 
 [lints]

crates/enc-mediafoundation/Cargo.toml

@@ -43,12 +43,12 @@ windows = { workspace = true, features = [
 	"Security_Authorization_AppCapabilityAccess",
 ] }
 windows-core.workspace = true
-windows-numerics = "0.2.0"
+windows-numerics = "0.3.0"
 scap-direct3d = { path = "../scap-direct3d" }
 
 [dev-dependencies]
 scap-targets = { path = "../scap-targets" }
-clap = { version = "4.5.46", features = ["derive"] }
+clap = { version = "4.5.47", features = ["derive"] }
 
 [lints]
 workspace = true