1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rhi: vulkan: Fix cloned VkRenderPass wrt multiview

Browse Source 
Change-Id: I2c97151d144a332fd078ec8940c063b30d3a6d7d
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
This commit is contained in:
Laszlo Agocs 2023-06-28 12:37:16 +02:00
parent 0e80b3b527
commit 6d9a99d6d8
1 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/gui/rhi/qrhivulkan.cpp
View File

@ -1355,6 +1355,39 @@ bool QRhiVulkan::createDefaultRenderPass(QVkRenderPassDescriptor *rpD, bool hasD
return true; return true;
} }
struct MultiViewRenderPassSetupHelper
{
bool prepare(VkRenderPassCreateInfo *rpInfo, int multiViewCount, bool multiViewCap)
{
if (multiViewCount < 2)
return true;
if (!multiViewCap) {
qWarning("Cannot create multiview render pass without support for the Vulkan 1.1 multiview feature");
return false;
}
#ifdef VK_VERSION_1_1
uint32_t allViewsMask = 0;
for (uint32_t i = 0; i < uint32_t(multiViewCount); ++i)
allViewsMask |= (1 << i);
multiViewMask = allViewsMask;
multiViewCorrelationMask = allViewsMask;
multiViewInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO;
multiViewInfo.subpassCount = 1;
multiViewInfo.pViewMasks = &multiViewMask;
multiViewInfo.correlationMaskCount = 1;
multiViewInfo.pCorrelationMasks = &multiViewCorrelationMask;
rpInfo->pNext = &multiViewInfo;
#endif
return true;
}
#ifdef VK_VERSION_1_1
VkRenderPassMultiviewCreateInfo multiViewInfo = {};
uint32_t multiViewMask = 0;
uint32_t multiViewCorrelationMask = 0;
#endif
};
bool QRhiVulkan::createOffscreenRenderPass(QVkRenderPassDescriptor *rpD, bool QRhiVulkan::createOffscreenRenderPass(QVkRenderPassDescriptor *rpD,
const QRhiColorAttachment *firstColorAttachment, const QRhiColorAttachment *firstColorAttachment,
const QRhiColorAttachment *lastColorAttachment, const QRhiColorAttachment *lastColorAttachment,
@ -1468,28 +1501,9 @@ bool QRhiVulkan::createOffscreenRenderPass(QVkRenderPassDescriptor *rpD,
VkSubpassDescription subpassDesc; VkSubpassDescription subpassDesc;
fillRenderPassCreateInfo(&rpInfo, &subpassDesc, rpD); fillRenderPassCreateInfo(&rpInfo, &subpassDesc, rpD);
#ifdef VK_VERSION_1_1 MultiViewRenderPassSetupHelper multiViewHelper;
VkRenderPassMultiviewCreateInfo multiViewInfo = {}; if (!multiViewHelper.prepare(&rpInfo, multiViewCount, caps.multiView))
uint32_t allViewsMask = 0; return false;
for (uint32_t i = 0; i < uint32_t(multiViewCount); ++i)
allViewsMask |= (1 << i);
uint32_t multiViewMasks[] = { allViewsMask };
uint32_t multiViewCorrelationMasks[] = { allViewsMask };
#endif
if (multiViewCount > 0) {
if (!caps.multiView) {
qWarning("Cannot create multiview render pass without support for the Vulkan 1.1 multiview feature");
return false;
}
#ifdef VK_VERSION_1_1
multiViewInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO;
multiViewInfo.subpassCount = 1;
multiViewInfo.pViewMasks = multiViewMasks;
multiViewInfo.correlationMaskCount = 1;
multiViewInfo.pCorrelationMasks = multiViewCorrelationMasks;
rpInfo.pNext = &multiViewInfo;
#endif
}
VkResult err = df->vkCreateRenderPass(dev, &rpInfo, nullptr, &rpD->rp); VkResult err = df->vkCreateRenderPass(dev, &rpInfo, nullptr, &rpD->rp);
if (err != VK_SUCCESS) { if (err != VK_SUCCESS) {
@ -6599,6 +6613,12 @@ QRhiRenderPassDescriptor *QVkRenderPassDescriptor::newCompatibleRenderPassDescri
fillRenderPassCreateInfo(&rpInfo, &subpassDesc, rpD); fillRenderPassCreateInfo(&rpInfo, &subpassDesc, rpD);
QRHI_RES_RHI(QRhiVulkan); QRHI_RES_RHI(QRhiVulkan);
MultiViewRenderPassSetupHelper multiViewHelper;
if (!multiViewHelper.prepare(&rpInfo, multiViewCount, rhiD->caps.multiView)) {
delete rpD;
return nullptr;
}
VkResult err = rhiD->df->vkCreateRenderPass(rhiD->dev, &rpInfo, nullptr, &rpD->rp); VkResult err = rhiD->df->vkCreateRenderPass(rhiD->dev, &rpInfo, nullptr, &rpD->rp);
if (err != VK_SUCCESS) { if (err != VK_SUCCESS) {
qWarning("Failed to create renderpass: %d", err); qWarning("Failed to create renderpass: %d", err);