From ca0afa0c7c4cff547b73085542213ddd177cc337 Mon Sep 17 00:00:00 2001 From: Connor Fitzgerald Date: Sat, 2 Jul 2022 21:39:57 -0400 Subject: [PATCH] Fix AutoNoVsync on OpenGL --- wgpu-core/src/device/mod.rs | 45 ++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/wgpu-core/src/device/mod.rs b/wgpu-core/src/device/mod.rs index 59a7460d7..cf95f61b8 100644 --- a/wgpu-core/src/device/mod.rs +++ b/wgpu-core/src/device/mod.rs @@ -4975,36 +4975,35 @@ impl Global { ); } if !caps.present_modes.contains(&config.present_mode) { - let new_mode = loop { + let new_mode = 'b: loop { // Automatic present mode checks. // // The "Automatic" modes are never supported by the backends. - match config.present_mode { + let fallbacks = match config.present_mode { wgt::PresentMode::AutoVsync => { - if caps.present_modes.contains(&wgt::PresentMode::FifoRelaxed) { - break wgt::PresentMode::FifoRelaxed; - } - if caps.present_modes.contains(&wgt::PresentMode::Fifo) { - break wgt::PresentMode::Fifo; - } + &[wgt::PresentMode::FifoRelaxed, wgt::PresentMode::Fifo][..] } - wgt::PresentMode::AutoNoVsync => { - if caps.present_modes.contains(&wgt::PresentMode::Immediate) { - break wgt::PresentMode::Immediate; - } - if caps.present_modes.contains(&wgt::PresentMode::Mailbox) { - break wgt::PresentMode::Mailbox; - } - if caps.present_modes.contains(&wgt::PresentMode::Fifo) { - break wgt::PresentMode::Fifo; - } + // Always end in FIFO to make sure it's always supported + wgt::PresentMode::AutoNoVsync => &[ + wgt::PresentMode::Immediate, + wgt::PresentMode::Mailbox, + wgt::PresentMode::Fifo, + ][..], + _ => { + return Err(E::UnsupportedPresentMode { + requested: config.present_mode, + available: caps.present_modes.clone(), + }); + } + }; + + for &fallback in fallbacks { + if caps.present_modes.contains(&fallback) { + break 'b fallback; } - _ => {} } - return Err(E::UnsupportedPresentMode { - requested: config.present_mode, - available: caps.present_modes.clone(), - }); + + unreachable!("Fallback system failed to choose present mode. This is a bug. Mode: {:?}, Options: {:?}", config.present_mode, &caps.present_modes); }; log::info!(