From 698a87febc78c7150084e8b281eb603887fface4 Mon Sep 17 00:00:00 2001
From: aiongg <aiongtaigi@gmail.com>
Date: Mon, 12 Oct 2026 19:50:35 +0000
Subject: [PATCH] Integration: wgpu errors are logged only after the start-up
 frames, so a failing adapter still starts the app again on the next one (#612
 x adapter restart)

---
 apps/designcraft/src/main.rs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/apps/designcraft/src/main.rs b/apps/designcraft/src/main.rs
index 56e51ddc0..ac23d2071 100644
--- a/apps/designcraft/src/main.rs
+++ b/apps/designcraft/src/main.rs
@@ -42,6 +42,10 @@ struct App {
     movable: Option<bool>,
     /// Frames begun so far.
     frames: u32,
+    /// The device whose uncaptured errors are logged once the window is past its start-up frames
+    /// (`gpu_limits::log_uncaptured_errors`). Until then wgpu's default handler panics, so a
+    /// failing adapter still makes `gpu` start again on the next one.
+    log_errors_after_startup: Option<eframe::wgpu::Device>,
 }
 
 impl eframe::App for App {
@@ -56,6 +60,11 @@ impl eframe::App for App {
             self.startup.presented();
         }
         self.frames = self.frames.saturating_add(1);
+        if u64::from(self.frames) >= gpu::STARTUP_FRAMES
+            && let Some(device) = self.log_errors_after_startup.take()
+        {
+            gpu_limits::log_uncaptured_errors(&device);
+        }
         #[cfg(target_os = "macos")]
         {
             if self.menu.is_none() && std::env::var_os("DESIGNCRAFT_NO_NATIVE_MENU").is_none() {
@@ -442,8 +451,9 @@ fn main() -> std::process::ExitCode {
             options,
             Box::new(move |cc| {
                 let mut restarted = None;
+                let mut device = None;
                 if let Some(rs) = &cc.wgpu_render_state {
-                    gpu_limits::log_uncaptured_errors(&rs.device);
+                    device = Some(rs.device.clone());
                     // What a bug report needs to know about the graphics driver.
                     let info = rs.adapter.get_info();
                     log::info!(
@@ -509,6 +519,7 @@ fn main() -> std::process::ExitCode {
                     #[cfg(target_os = "macos")]
                     movable: None,
                     frames: 0,
+                    log_errors_after_startup: device,
                 }))
             }),
         )