VERY experimental Nintendo Switch 2 emulator
C++
Vulkan Swapchain: Overall improvements.
Fernando Sahmkow46a73fed376e
diff --git a/src/video_core/renderer_vulkan/renderer_vulkan.cpp b/src/video_core/renderer_vulkan/renderer_vulkan.cppindex d12669c9d4..51d9e8f68c 100644--- a/src/video_core/renderer_vulkan/renderer_vulkan.cpp+++ b/src/video_core/renderer_vulkan/renderer_vulkan.cpp@@ -147,7 +147,7 @@ void RendererVulkan::SwapBuffers(const Tegra::FramebufferConfig* framebuffer) {const auto recreate_swapchain = [&] {if (!has_been_recreated) {has_been_recreated = true;- scheduler.WaitWorker();+ scheduler.Finish();}const Layout::FramebufferLayout layout = render_window.GetFramebufferLayout();swapchain.Create(layout.width, layout.height, is_srgb);diff --git a/src/video_core/renderer_vulkan/vk_swapchain.cpp b/src/video_core/renderer_vulkan/vk_swapchain.cppindex a69ae7725e..706d9ba746 100644--- a/src/video_core/renderer_vulkan/vk_swapchain.cpp+++ b/src/video_core/renderer_vulkan/vk_swapchain.cpp@@ -36,7 +36,8 @@ VkPresentModeKHR ChooseSwapPresentMode(vk::Span<VkPresentModeKHR> modes) {// Mailbox (triple buffering) doesn't lock the application like fifo (vsync),// prefer it if vsync option is not selectedconst auto found_mailbox = std::find(modes.begin(), modes.end(), VK_PRESENT_MODE_MAILBOX_KHR);- if (found_mailbox != modes.end() && !Settings::values.use_vsync.GetValue()) {+ if (Settings::values.fullscreen_mode.GetValue() == Settings::FullscreenMode::Borderless &&+ found_mailbox != modes.end() && !Settings::values.use_vsync.GetValue()) {return VK_PRESENT_MODE_MAILBOX_KHR;}if (!Settings::values.use_speed_limit.GetValue()) {@@ -156,8 +157,16 @@ void Swapchain::CreateSwapchain(const VkSurfaceCapabilitiesKHR& capabilities, u3present_mode = ChooseSwapPresentMode(present_modes);u32 requested_image_count{capabilities.minImageCount + 1};- if (capabilities.maxImageCount > 0 && requested_image_count > capabilities.maxImageCount) {- requested_image_count = capabilities.maxImageCount;+ // Ensure Tripple buffering if possible.+ if (capabilities.maxImageCount > 0) {+ if (requested_image_count > capabilities.maxImageCount) {+ requested_image_count = capabilities.maxImageCount;+ } else {+ requested_image_count =+ std::max(requested_image_count, std::min(3U, capabilities.maxImageCount));+ }+ } else {+ requested_image_count = std::max(requested_image_count, 3U);}VkSwapchainCreateInfoKHR swapchain_ci{.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR,diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cppindex c63ce3a308..4146ebc2c1 100644--- a/src/yuzu/main.cpp+++ b/src/yuzu/main.cpp@@ -3,6 +3,7 @@#include <cinttypes>#include <clocale>+#include <cmath>#include <memory>#include <thread>#ifdef __APPLE__@@ -3451,9 +3452,10 @@ void GMainWindow::UpdateStatusBar() {}if (!Settings::values.use_speed_limit) {game_fps_label->setText(- tr("Game: %1 FPS (Unlocked)").arg(results.average_game_fps, 0, 'f', 0));+ tr("Game: %1 FPS (Unlocked)").arg(std::round(results.average_game_fps), 0, 'f', 0));} else {- game_fps_label->setText(tr("Game: %1 FPS").arg(results.average_game_fps, 0, 'f', 0));+ game_fps_label->setText(+ tr("Game: %1 FPS").arg(std::round(results.average_game_fps), 0, 'f', 0));}emu_frametime_label->setText(tr("Frame: %1 ms").arg(results.frametime * 1000.0, 0, 'f', 2));