From 3abacf39dedde7604c67ff8d5dd2c3c950b56d3d Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Mon, 30 Mar 2020 12:28:49 +0200 Subject: [PATCH] RHI: Fix running with Vulkan on Wayland When the Wayland client plugin is in use, the capabilities for the surface may report a minimum image count of 4. The internal "maximum minimum count" of 3, was arbitrary and only used for sizing buffers. To be more friendly to different setups, we remove the restriction and use QVarLengthArrays instead. We also set the initial size of the buffers to 4 so that we can run with Wayland without any resizing, but now the arrays will also grow to be safe for cases where 4 is not sufficient. Change-Id: Iba5434e84417d36b70f2655b152e816f04650ce4 Reviewed-by: Laszlo Agocs --- src/gui/rhi/qrhivulkan.cpp | 26 +++++++++----------------- src/gui/rhi/qrhivulkan_p_p.h | 5 +++-- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/src/gui/rhi/qrhivulkan.cpp b/src/gui/rhi/qrhivulkan.cpp index 26c153afff5..211ee195e5c 100644 --- a/src/gui/rhi/qrhivulkan.cpp +++ b/src/gui/rhi/qrhivulkan.cpp @@ -1296,16 +1296,11 @@ bool QRhiVulkan::recreateSwapChain(QRhiSwapChain *swapChain) VkSurfaceCapabilitiesKHR surfaceCaps; vkGetPhysicalDeviceSurfaceCapabilitiesKHR(physDev, swapChainD->surface, &surfaceCaps); quint32 reqBufferCount; - if (swapChainD->m_flags.testFlag(QRhiSwapChain::MinimalBufferCount)) { + if (swapChainD->m_flags.testFlag(QRhiSwapChain::MinimalBufferCount) || surfaceCaps.maxImageCount == 0) { reqBufferCount = qMax(2, surfaceCaps.minImageCount); } else { - const quint32 maxBuffers = QVkSwapChain::MAX_BUFFER_COUNT; - if (surfaceCaps.maxImageCount) - reqBufferCount = qMax(qMin(surfaceCaps.maxImageCount, maxBuffers), surfaceCaps.minImageCount); - else - reqBufferCount = qMax(2, surfaceCaps.minImageCount); + reqBufferCount = qMax(qMin(surfaceCaps.maxImageCount, 3), surfaceCaps.minImageCount); } - VkSurfaceTransformFlagBitsKHR preTransform = (surfaceCaps.supportedTransforms & VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR) ? VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR @@ -1389,23 +1384,19 @@ bool QRhiVulkan::recreateSwapChain(QRhiSwapChain *swapChain) return false; } - if (actualSwapChainBufferCount > QVkSwapChain::MAX_BUFFER_COUNT) { - qWarning("Too many swapchain buffers (%u)", actualSwapChainBufferCount); - return false; - } if (actualSwapChainBufferCount != reqBufferCount) qCDebug(QRHI_LOG_INFO, "Actual swapchain buffer count is %u", actualSwapChainBufferCount); swapChainD->bufferCount = int(actualSwapChainBufferCount); - VkImage swapChainImages[QVkSwapChain::MAX_BUFFER_COUNT]; - err = vkGetSwapchainImagesKHR(dev, swapChainD->sc, &actualSwapChainBufferCount, swapChainImages); + QVarLengthArray swapChainImages(actualSwapChainBufferCount); + err = vkGetSwapchainImagesKHR(dev, swapChainD->sc, &actualSwapChainBufferCount, swapChainImages.data()); if (err != VK_SUCCESS) { qWarning("Failed to get swapchain images: %d", err); return false; } - VkImage msaaImages[QVkSwapChain::MAX_BUFFER_COUNT]; - VkImageView msaaViews[QVkSwapChain::MAX_BUFFER_COUNT]; + QVarLengthArray msaaImages(swapChainD->bufferCount); + QVarLengthArray msaaViews(swapChainD->bufferCount); if (swapChainD->samples > VK_SAMPLE_COUNT_1_BIT) { if (!createTransientImage(swapChainD->colorFormat, swapChainD->pixelSize, @@ -1413,8 +1404,8 @@ bool QRhiVulkan::recreateSwapChain(QRhiSwapChain *swapChain) VK_IMAGE_ASPECT_COLOR_BIT, swapChainD->samples, &swapChainD->msaaImageMem, - msaaImages, - msaaViews, + msaaImages.data(), + msaaViews.data(), swapChainD->bufferCount)) { qWarning("Failed to create transient image for MSAA color buffer"); @@ -1427,6 +1418,7 @@ bool QRhiVulkan::recreateSwapChain(QRhiSwapChain *swapChain) fenceInfo.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; fenceInfo.flags = VK_FENCE_CREATE_SIGNALED_BIT; + swapChainD->imageRes.resize(swapChainD->bufferCount); for (int i = 0; i < swapChainD->bufferCount; ++i) { QVkSwapChain::ImageResources &image(swapChainD->imageRes[i]); image.image = swapChainImages[i]; diff --git a/src/gui/rhi/qrhivulkan_p_p.h b/src/gui/rhi/qrhivulkan_p_p.h index 62516e268d9..d90b1d13640 100644 --- a/src/gui/rhi/qrhivulkan_p_p.h +++ b/src/gui/rhi/qrhivulkan_p_p.h @@ -587,7 +587,7 @@ struct QVkSwapChain : public QRhiSwapChain bool ensureSurface(); - static const quint32 MAX_BUFFER_COUNT = 3; + static const quint32 EXPECTED_MAX_BUFFER_COUNT = 4; QWindow *window = nullptr; QSize pixelSize; @@ -617,7 +617,8 @@ struct QVkSwapChain : public QRhiSwapChain ScImageUseTransferSource }; LastUse lastUse = ScImageUseNone; - } imageRes[MAX_BUFFER_COUNT]; + }; + QVarLengthArray imageRes; struct FrameResources { VkFence imageFence = VK_NULL_HANDLE;