Merge branch 'trunk' into master

gents83 · Nov 10, 2023 · 2710cdd · 2710cdd
2 parents ae0b777 + 2e7fd75
commit 2710cdd
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/wgpu-hal/src/vulkan/conv.rs b/wgpu-hal/src/vulkan/conv.rs
@@ -451,8 +451,7 @@ pub fn map_vk_present_mode(mode: vk::PresentModeKHR) -> Option<wgt::PresentMode>
     } else if mode == vk::PresentModeKHR::FIFO {
         Some(wgt::PresentMode::Fifo)
     } else if mode == vk::PresentModeKHR::FIFO_RELAXED {
-        //Some(wgt::PresentMode::Relaxed)
-        None
+        Some(wgt::PresentMode::FifoRelaxed)
     } else {
         log::warn!("Unrecognized present mode {:?}", mode);
         None