Fix examples crashing when minimized (#62)

hakolao · Feb 12, 2024 · a14b0c7 · a14b0c7
1 parent 244565b
commit a14b0c7
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 59 deletions.
diff --git a/examples/demo_app.rs b/examples/demo_app.rs
@@ -8,7 +8,6 @@
 // according to those terms.
 
 use egui_winit_vulkano::{egui, Gui, GuiConfig};
-use vulkano::sync::{self, GpuFuture};
 use vulkano_util::{
     context::{VulkanoConfig, VulkanoContext},
     window::{VulkanoWindows, WindowDescriptor},
@@ -119,19 +118,18 @@ pub fn main() {
 
                     // Render UI
                     // Acquire swapchain future
-                    let before_future = match renderer.acquire() {
-                        Ok(future) => future,
+                    match renderer.acquire() {
+                        Ok(future) => {
+                            let after_future =
+                                gui.draw_on_image(future, renderer.swapchain_image_view());
+                            // Present swapchain
+                            renderer.present(after_future, true);
+                        }
                         Err(vulkano::VulkanError::OutOfDate) => {
                             renderer.resize();
-                            sync::now(context.device().clone()).boxed()
                         }
                         Err(e) => panic!("Failed to acquire swapchain future: {}", e),
                     };
-                    // Render gui
-                    let after_future =
-                        gui.draw_on_image(before_future, renderer.swapchain_image_view());
-                    // Present swapchain
-                    renderer.present(after_future, true);
                 }
                 Event::MainEventsCleared => {
                     renderer.window().request_redraw();

diff --git a/examples/minimal.rs b/examples/minimal.rs
@@ -11,7 +11,6 @@
 
 use egui::{ScrollArea, TextEdit, TextStyle};
 use egui_winit_vulkano::{egui, Gui, GuiConfig};
-use vulkano::sync::{self, GpuFuture};
 use vulkano_util::{
     context::{VulkanoConfig, VulkanoContext},
     window::{VulkanoWindows, WindowDescriptor},
@@ -98,19 +97,19 @@ pub fn main() {
                 });
                 // Render UI
                 // Acquire swapchain future
-                let before_future = match renderer.acquire() {
-                    Ok(future) => future,
+                match renderer.acquire() {
+                    Ok(future) => {
+                        // Render gui
+                        let after_future =
+                            gui.draw_on_image(future, renderer.swapchain_image_view());
+                        // Present swapchain
+                        renderer.present(after_future, true);
+                    }
                     Err(vulkano::VulkanError::OutOfDate) => {
                         renderer.resize();
-                        sync::now(context.device().clone()).boxed()
                     }
                     Err(e) => panic!("Failed to acquire swapchain future: {}", e),
                 };
-                // Render gui
-                let after_future =
-                    gui.draw_on_image(before_future, renderer.swapchain_image_view());
-                // Present swapchain
-                renderer.present(after_future, true);
             }
             Event::MainEventsCleared => {
                 renderer.window().request_redraw();

diff --git a/examples/multisample.rs b/examples/multisample.rs
@@ -41,7 +41,7 @@ use vulkano::{
         DynamicState, GraphicsPipeline, PipelineLayout, PipelineShaderStageCreateInfo,
     },
     render_pass::{Framebuffer, FramebufferCreateInfo, RenderPass, Subpass},
-    sync::{self, GpuFuture},
+    sync::GpuFuture,
 };
 use vulkano_util::{
     context::{VulkanoConfig, VulkanoContext},
@@ -129,19 +129,19 @@ pub fn main() {
                 });
                 // Render
                 // Acquire swapchain future
-                let before_future = match renderer.acquire() {
-                    Ok(future) => future,
+                match renderer.acquire() {
+                    Ok(future) => {
+                        // Render
+                        let after_future =
+                            pipeline.render(future, renderer.swapchain_image_view(), &mut gui);
+                        // Present swapchain
+                        renderer.present(after_future, true);
+                    }
                     Err(vulkano::VulkanError::OutOfDate) => {
                         renderer.resize();
-                        sync::now(context.device().clone()).boxed()
                     }
                     Err(e) => panic!("Failed to acquire swapchain future: {}", e),
                 };
-                // Render
-                let after_future =
-                    pipeline.render(before_future, renderer.swapchain_image_view(), &mut gui);
-                // Present swapchain
-                renderer.present(after_future, true);
             }
             Event::MainEventsCleared => {
                 renderer.window().request_redraw();

diff --git a/examples/paint_callback.rs b/examples/paint_callback.rs
@@ -27,7 +27,6 @@ use vulkano::{
         layout::PipelineDescriptorSetLayoutCreateInfo,
         DynamicState, GraphicsPipeline, PipelineLayout, PipelineShaderStageCreateInfo,
     },
-    sync::{self, GpuFuture},
 };
 use vulkano_util::{
     context::{VulkanoConfig, VulkanoContext},
@@ -120,19 +119,19 @@ pub fn main() {
                 });
                 // Render UI
                 // Acquire swapchain future
-                let before_future = match renderer.acquire() {
-                    Ok(future) => future,
+                match renderer.acquire() {
+                    Ok(future) => {
+                        // Render gui
+                        let after_future =
+                            gui.draw_on_image(future, renderer.swapchain_image_view());
+                        // Present swapchain
+                        renderer.present(after_future, true);
+                    }
                     Err(vulkano::VulkanError::OutOfDate) => {
                         renderer.resize();
-                        sync::now(context.device().clone()).boxed()
                     }
                     Err(e) => panic!("Failed to acquire swapchain future: {}", e),
                 };
-                // Render gui
-                let after_future =
-                    gui.draw_on_image(before_future, renderer.swapchain_image_view());
-                // Present swapchain
-                renderer.present(after_future, true);
             }
             Event::MainEventsCleared => {
                 renderer.window().request_redraw();

diff --git a/examples/subpass.rs b/examples/subpass.rs
@@ -41,7 +41,7 @@ use vulkano::{
         DynamicState, GraphicsPipeline, PipelineLayout, PipelineShaderStageCreateInfo,
     },
     render_pass::{Framebuffer, FramebufferCreateInfo, RenderPass, Subpass},
-    sync::{self, GpuFuture},
+    sync::GpuFuture,
 };
 use vulkano_util::{
     context::{VulkanoConfig, VulkanoContext},
@@ -124,21 +124,20 @@ pub fn main() {
                 });
 
                 // Acquire swapchain future
-                let before_future = match renderer.acquire() {
-                    Ok(future) => future,
+                match renderer.acquire() {
+                    Ok(future) => {
+                        // Render gui
+                        let after_future =
+                            gui_pipeline.render(future, renderer.swapchain_image_view(), &mut gui);
+
+                        // Present swapchain
+                        renderer.present(after_future, true);
+                    }
                     Err(vulkano::VulkanError::OutOfDate) => {
                         renderer.resize();
-                        sync::now(context.device().clone()).boxed()
                     }
                     Err(e) => panic!("Failed to acquire swapchain future: {}", e),
                 };
-
-                // Render gui
-                let after_future =
-                    gui_pipeline.render(before_future, renderer.swapchain_image_view(), &mut gui);
-
-                // Present swapchain
-                renderer.present(after_future, true);
             }
             Event::MainEventsCleared => {
                 renderer.window().request_redraw();

diff --git a/examples/wholesome/main.rs b/examples/wholesome/main.rs
@@ -20,7 +20,6 @@ use vulkano::{
     format::Format,
     image::{view::ImageView, Image, ImageCreateInfo, ImageType, ImageUsage},
     memory::allocator::AllocationCreateInfo,
-    sync::{self, GpuFuture},
 };
 use vulkano_util::{
     context::{VulkanoConfig, VulkanoContext},
@@ -221,22 +220,22 @@ pub fn main() {
                 });
                 // Render UI
                 // Acquire swapchain future
-                let before_future = match renderer.acquire() {
-                    Ok(future) => future,
+                match renderer.acquire() {
+                    Ok(future) => {
+                        // Draw scene
+                        let after_scene_draw =
+                            scene_render_pipeline.render(future, scene_image.clone());
+                        // Render gui
+                        let after_future =
+                            gui.draw_on_image(after_scene_draw, renderer.swapchain_image_view());
+                        // Present swapchain
+                        renderer.present(after_future, true);
+                    }
                     Err(vulkano::VulkanError::OutOfDate) => {
                         renderer.resize();
-                        sync::now(context.device().clone()).boxed()
                     }
                     Err(e) => panic!("Failed to acquire swapchain future: {}", e),
                 };
-                // Draw scene
-                let after_scene_draw =
-                    scene_render_pipeline.render(before_future, scene_image.clone());
-                // Render gui
-                let after_future =
-                    gui.draw_on_image(after_scene_draw, renderer.swapchain_image_view());
-                // Present swapchain
-                renderer.present(after_future, true);
 
                 // Update fps & dt
                 time.update();