Skip to content

Commit 6b1308b

Browse files
committed
Address PR review comments for wgpu instance, camera protection, and adapter fallback
1 parent 1dce18c commit 6b1308b

3 files changed

Lines changed: 15 additions & 3 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ impl ScreenshotEditorInstances {
258258
is_software_adapter: gpu.is_software_adapter,
259259
}
260260
} else {
261-
let instance = wgpu::Instance::new(&wgpu::InstanceDescriptor::default());
261+
let instance = cap_rendering::create_wgpu_instance().await;
262262
let adapter = instance
263263
.request_adapter(&wgpu::RequestAdapterOptions {
264264
power_preference: wgpu::PowerPreference::HighPerformance,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1483,6 +1483,7 @@ impl ShowCapWindow {
14831483
",
14841484
state.camera_ws_port, centered
14851485
))
1486+
.content_protected(should_protect)
14861487
.transparent(true)
14871488
.visible(false);
14881489

crates/rendering/src/lib.rs

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,25 @@ pub async fn create_wgpu_instance() -> wgpu::Instance {
8989
pub async fn probe_software_adapter() -> Option<(bool, String)> {
9090
let instance = create_wgpu_instance().await;
9191

92-
let adapter = instance
92+
let adapter = match instance
9393
.request_adapter(&wgpu::RequestAdapterOptions {
9494
power_preference: wgpu::PowerPreference::HighPerformance,
9595
force_fallback_adapter: false,
9696
compatible_surface: None,
9797
})
9898
.await
99-
.ok()?;
99+
.ok()
100+
{
101+
Some(adapter) => adapter,
102+
None => instance
103+
.request_adapter(&wgpu::RequestAdapterOptions {
104+
power_preference: wgpu::PowerPreference::LowPower,
105+
force_fallback_adapter: true,
106+
compatible_surface: None,
107+
})
108+
.await
109+
.ok()?,
110+
};
100111
let info = adapter.get_info();
101112
Some((is_software_wgpu_adapter(&info), info.name))
102113
}

0 commit comments

Comments
 (0)