From de7c92d7c4dcb65beef3c9248f1a8e5e05afee34 Mon Sep 17 00:00:00 2001 From: Liam Date: Thu, 18 May 2023 18:01:01 -0400 Subject: [PATCH 1/2] renderer_vulkan: remove wrong constexpr --- src/video_core/renderer_vulkan/vk_swapchain.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/video_core/renderer_vulkan/vk_swapchain.cpp b/src/video_core/renderer_vulkan/vk_swapchain.cpp index 1e80ce4639..8c0dec5900 100644 --- a/src/video_core/renderer_vulkan/vk_swapchain.cpp +++ b/src/video_core/renderer_vulkan/vk_swapchain.cpp @@ -34,8 +34,8 @@ VkSurfaceFormatKHR ChooseSwapSurfaceFormat(vk::Span 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]() { From 55d740fffa540ffae483a46b4a3b907b40fc3b15 Mon Sep 17 00:00:00 2001 From: Danila Malyutin Date: Fri, 19 May 2023 01:24:45 +0300 Subject: [PATCH 2/2] externals: update cubeb (#10362) --- externals/cubeb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/cubeb b/externals/cubeb index 75d9d125ee..2d817de7c5 160000 --- a/externals/cubeb +++ b/externals/cubeb @@ -1 +1 @@ -Subproject commit 75d9d125ee655ef80f3bfcd97ae5a805931042b8 +Subproject commit 2d817de7c58b33a7c045edf873f3f9c98e4a2082