Commit: 2e93909f5f2bf6f242da4777d4a068d7a8627ca6 - mel (hg)

Commit MetaInfo

• Révision: 2e93909f5f2bf6f242da4777d4a068d7a8627ca6 (tree)
• l'heure: 2020-07-10 14:10:33
• Auteur: Martin Krošlák <kroslakma@gmai...>
• Commiter: Martin Krošlák

Message de Log

Fix unhandled swapchain suboptimal results

Change Summary

• modified: code/mel/gal/src/lib.rs
• modified: code/mel/gal/src/misc.rs
• add: run.sh

Modification

diff -r f18e438f7bde -r 2e93909f5f2b code/mel/gal/src/lib.rs
--- a/code/mel/gal/src/lib.rs	Tue Jun 30 21:06:27 2020 +0200
+++ b/code/mel/gal/src/lib.rs	Fri Jul 10 07:10:33 2020 +0200
@@ -65,6 +65,7 @@
     state: StateBuffer,
 
     index_count: u32,
+    recreate_flipchain: bool,
 
     mem_sys: MemorySystem,
     init_provider: InitProvider,

diff -r f18e438f7bde -r 2e93909f5f2b code/mel/gal/src/misc.rs
--- a/code/mel/gal/src/misc.rs	Tue Jun 30 21:06:27 2020 +0200
+++ b/code/mel/gal/src/misc.rs	Fri Jul 10 07:10:33 2020 +0200
@@ -142,6 +142,7 @@
             state: StateBuffer::default(),
 
             index_count: ib_data.len() as u32,
+            recreate_flipchain: false,
 
             mem_sys,
             init_provider,
@@ -199,7 +200,7 @@
             let (flipchain, acquire_result) = match acquire_result {
                 Ok(idx) => (self.flipchain.as_mut().unwrap(), Ok(idx)),
                 Err(vk::Result::ERROR_OUT_OF_DATE_KHR) => {
-                    on_window_size_changed(
+                    recreate_flipchain(
                         &self.device,
                         &self.surface,
                         &mut self.flipchain,
@@ -208,6 +209,7 @@
                         &self.shaders,
                         &self.init_provider,
                     );
+                    self.recreate_flipchain = false;
 
                     match self.flipchain {
                         Some(ref mut flipchain) => {
@@ -229,7 +231,10 @@
                 Err(result) => panic!("Unexpected result of next image acquire: {:?}", result),
             };
 
-            let (flipchain_frame_idx, _is_suboptimal) = acquire_result.unwrap();
+            let (flipchain_frame_idx, is_suboptimal) = acquire_result.unwrap();
+            if is_suboptimal {
+                self.recreate_flipchain = true;
+            }
 
             let vframe = &mut self.virtual_frames[virtual_frame_idx];
             vframe.begin_cb_graphics(
@@ -272,8 +277,17 @@
         };
 
         match present_result {
-            Ok(_is_suboptimal) => (),
-            Err(vk::Result::ERROR_OUT_OF_DATE_KHR) => on_window_size_changed(
+            Ok(is_suboptimal) => {
+                if is_suboptimal {
+                    self.recreate_flipchain = true;
+                }
+            }
+            Err(vk::Result::ERROR_OUT_OF_DATE_KHR) => self.recreate_flipchain = true,
+            Err(result) => panic!("Unexpected result of present: {:?}", result),
+        };
+
+        if self.recreate_flipchain {
+            recreate_flipchain(
                 &self.device,
                 &self.surface,
                 &mut self.flipchain,
@@ -281,9 +295,9 @@
                 &mut self.render_pass,
                 &self.shaders,
                 &self.init_provider,
-            ),
-            Err(result) => panic!("Unexpected result of present: {:?}", result),
-        };
+            );
+            self.recreate_flipchain = false;
+        }
     }
 
     fn begin_2d_rendering(
@@ -524,7 +538,7 @@
     }
 }
 
-fn on_window_size_changed(
+fn recreate_flipchain(
     device: &api::Device,
     surface: &api::SurfaceKHR,
     flipchain: &mut Option<Flipchain>,

diff -r f18e438f7bde -r 2e93909f5f2b run.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/run.sh	Fri Jul 10 07:10:33 2020 +0200
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+cargo build --workspace
+export VK_INSTANCE_LAYERS=VK_LAYER_KHRONOS_validation
+export MEL_MODULE_PATH_BASE=target/debug
+gdb -q target/debug/game