Merge branch 'yuzu-emu:master' into cinematic-fix-pr

This commit is contained in:
DENIEL-VALERO Ewan 2023-05-19 01:17:03 +02:00 committed by GitHub
commit 3886f0c128
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

2
externals/cubeb vendored

@ -1 +1 @@
Subproject commit 75d9d125ee655ef80f3bfcd97ae5a805931042b8
Subproject commit 2d817de7c58b33a7c045edf873f3f9c98e4a2082

View file

@ -34,8 +34,8 @@ VkSurfaceFormatKHR ChooseSwapSurfaceFormat(vk::Span<VkSurfaceFormatKHR> formats)
return found != formats.end() ? *found : formats[0];
}
static constexpr VkPresentModeKHR ChooseSwapPresentMode(bool has_imm, bool has_mailbox,
bool has_fifo_relaxed) {
static VkPresentModeKHR ChooseSwapPresentMode(bool has_imm, bool has_mailbox,
bool has_fifo_relaxed) {
// Mailbox doesn't lock the application like FIFO (vsync)
// FIFO present mode locks the framerate to the monitor's refresh rate
Settings::VSyncMode setting = [has_imm, has_mailbox]() {