Add debug + increase timeout

blaind · Nov 12, 2022 · 48463bb · 48463bb
1 parent d536613
commit 48463bb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/wgpu-core/src/present.rs b/wgpu-core/src/present.rs
@@ -26,7 +26,7 @@ use hal::{Queue as _, Surface as _};
 use thiserror::Error;
 use wgt::SurfaceStatus as Status;
 
-const FRAME_TIMEOUT_MS: u32 = 1000;
+const FRAME_TIMEOUT_MS: u32 = 3_000;
 pub const DESIRED_NUM_FRAMES: u32 = 3;
 
 #[derive(Debug)]
@@ -134,6 +134,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
 
         let suf = A::get_surface_mut(surface);
         let (texture_id, status) = match unsafe {
+            println!("Acquiring texture...");
             suf.unwrap()
                 .raw
                 .acquire_texture(Some(std::time::Duration::from_millis(

diff --git a/wgpu-hal/src/vulkan/instance.rs b/wgpu-hal/src/vulkan/instance.rs
@@ -755,6 +755,7 @@ impl crate::Surface<super::Api> for super::Surface {
             {
                 Ok(pair) => pair,
                 Err(error) => {
+                    println!("ERR: {:?}, timeout_ns was: {}", error, timeout_ns);
                     return match error {
                         vk::Result::TIMEOUT => Ok(None),
                         vk::Result::NOT_READY | vk::Result::ERROR_OUT_OF_DATE_KHR => {

diff --git a/wgpu/examples/hello-triangle/main.rs b/wgpu/examples/hello-triangle/main.rs
@@ -84,7 +84,8 @@ async fn run(event_loop: EventLoop<()>, window: Window) {
         // the resources are properly cleaned up.
         let _ = (&instance, &adapter, &shader, &pipeline_layout);
 
-        *control_flow = ControlFlow::Wait;
+        *control_flow = ControlFlow::Poll;
+        println!("EVENT: {:?}", event);
         match event {
             Event::WindowEvent {
                 event: WindowEvent::Resized(size),
@@ -97,7 +98,7 @@ async fn run(event_loop: EventLoop<()>, window: Window) {
                 // On macos the window needs to be redrawn manually after resizing
                 window.request_redraw();
             }
-            Event::RedrawRequested(_) => {
+            Event::RedrawRequested(_) | Event::MainEventsCleared => {
                 let frame = surface
                     .get_current_texture()
                     .expect("Failed to acquire next swap chain texture");