Cayleb-Ordo/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fixes invalid swapchain size during a window minimize.

Browse Source 
Differential Revision: https://code.wildfiregames.com/D4932
This was SVN commit r27536.
This commit is contained in:
Vladislav Belov 2023-02-12 22:58:36 +00:00
parent e6d87c7fe4
commit afd0f181e1
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/renderer/backend/vulkan/SwapChain.cpp
View File

@ -46,15 +46,27 @@ std::unique_ptr<CSwapChain> CSwapChain::Create(
CDevice* device, VkSurfaceKHR surface, int surfaceDrawableWidth, int surfaceDrawableHeight,
std::unique_ptr<CSwapChain> oldSwapChain)
{
std::unique_ptr<CSwapChain> swapChain(new CSwapChain());
swapChain->m_Device = device;
VkPhysicalDevice physicalDevice = device->GetChoosenPhysicalDevice().device;
VkSurfaceCapabilitiesKHR surfaceCapabilities{};
ENSURE_VK_SUCCESS(vkGetPhysicalDeviceSurfaceCapabilitiesKHR(
physicalDevice, surface, &surfaceCapabilities));
const uint32_t swapChainWidth = Clamp<uint32_t>(surfaceDrawableWidth,
surfaceCapabilities.minImageExtent.width,
surfaceCapabilities.maxImageExtent.width);
const uint32_t swapChainHeight = Clamp<uint32_t>(surfaceDrawableHeight,
surfaceCapabilities.minImageExtent.height,
surfaceCapabilities.maxImageExtent.height);
// Some drivers (for example NVIDIA on Windows during minimize) might
// return zeroes for both minImageExtent and maxImageExtent. It means we're
// not able to create any swapchain. Because we can't choose zeros (they're
// not allowed) and we can't choose values bigger than maxImageExtent
// (which are also zeroes in that case).
if (swapChainWidth == 0 || swapChainHeight == 0)
return nullptr;
std::vector<VkSurfaceFormatKHR> surfaceFormats;
uint32_t surfaceFormatCount = 0;
ENSURE_VK_SUCCESS(vkGetPhysicalDeviceSurfaceFormatsKHR(
@ -111,13 +123,6 @@ std::unique_ptr<CSwapChain> CSwapChain::Create(
}
const VkSurfaceFormatKHR& surfaceFormat = *surfaceFormatIt;
const uint32_t swapChainWidth = Clamp<int>(surfaceDrawableWidth,
surfaceCapabilities.minImageExtent.width,
surfaceCapabilities.maxImageExtent.width);
const uint32_t swapChainHeight = Clamp<int>(surfaceDrawableHeight,
surfaceCapabilities.minImageExtent.height,
surfaceCapabilities.maxImageExtent.height);
VkSwapchainCreateInfoKHR swapChainCreateInfo{};
swapChainCreateInfo.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR;
swapChainCreateInfo.surface = surface;
@ -170,6 +175,8 @@ std::unique_ptr<CSwapChain> CSwapChain::Create(
if (oldSwapChain)
swapChainCreateInfo.oldSwapchain = oldSwapChain->GetVkSwapchain();
std::unique_ptr<CSwapChain> swapChain(new CSwapChain());
swapChain->m_Device = device;
ENSURE_VK_SUCCESS(vkCreateSwapchainKHR(
device->GetVkDevice(), &swapChainCreateInfo, nullptr, &swapChain->m_SwapChain));