From 48bc152a630157d5de48c8e0853267685ce4b603 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Thu, 29 Apr 2021 02:41:43 +1000 Subject: [PATCH] Vulkan/SwapChain: Ensure returned height is at least 1x1 --- src/common/vulkan/swap_chain.cpp | 4 ++-- src/frontend-common/common_host_interface.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/vulkan/swap_chain.cpp b/src/common/vulkan/swap_chain.cpp index f5009ea56..5be3dae05 100644 --- a/src/common/vulkan/swap_chain.cpp +++ b/src/common/vulkan/swap_chain.cpp @@ -648,8 +648,8 @@ bool SwapChain::CreateSwapChain() if (old_swap_chain != VK_NULL_HANDLE) vkDestroySwapchainKHR(g_vulkan_context->GetDevice(), old_swap_chain, nullptr); - m_window_info.surface_width = size.width; - m_window_info.surface_height = size.height; + m_window_info.surface_width = std::max(1u, size.width); + m_window_info.surface_height = std::max(1u, size.height); return true; } diff --git a/src/frontend-common/common_host_interface.cpp b/src/frontend-common/common_host_interface.cpp index bb1775e9d..310305111 100644 --- a/src/frontend-common/common_host_interface.cpp +++ b/src/frontend-common/common_host_interface.cpp @@ -571,8 +571,8 @@ void CommonHostInterface::ReleaseHostDisplayResources() void CommonHostInterface::OnHostDisplayResized() { - const u32 new_width = m_display ? std::max(m_display->GetWindowWidth(), 1) : 0; - const u32 new_height = m_display ? std::max(m_display->GetWindowHeight(), 1) : 0; + const u32 new_width = m_display ? m_display->GetWindowWidth() : 0; + const u32 new_height = m_display ? m_display->GetWindowHeight() : 0; const float new_scale = m_display ? m_display->GetWindowScale() : 1.0f; ImGui::GetIO().DisplaySize.x = static_cast(new_width);