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

rhi: vk: Fix invalid index for unused attachments

Browse Source 
Pick-to: 6.2
Change-Id: I8140de4eeb1a8a490fcffd10370c29a49d677fed
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
This commit is contained in:
Laszlo Agocs 2021-09-23 09:11:09 +02:00
parent 4c78ef80ca
commit 4715128213
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6236,33 +6236,35 @@ void QVkRenderPassDescriptor::updateSerializedFormat()
*p++ = resolveRefs.count();
*p++ = hasDepthStencil;
auto serializeAttachmentData = [&p](const VkAttachmentDescription &a, bool used) {
*p++ = used ? a.format : 0;
*p++ = used ? a.samples : 0;
*p++ = used ? a.loadOp : 0;
*p++ = used ? a.storeOp : 0;
*p++ = used ? a.stencilLoadOp : 0;
*p++ = used ? a.stencilStoreOp : 0;
*p++ = used ? a.initialLayout : 0;
*p++ = used ? a.finalLayout : 0;
auto serializeAttachmentData = [this, &p](uint32_t attIdx) {
const bool used = attIdx != VK_ATTACHMENT_UNUSED;
const VkAttachmentDescription *a = used ? &attDescs[attIdx] : nullptr;
*p++ = used ? a->format : 0;
*p++ = used ? a->samples : 0;
*p++ = used ? a->loadOp : 0;
*p++ = used ? a->storeOp : 0;
*p++ = used ? a->stencilLoadOp : 0;
*p++ = used ? a->stencilStoreOp : 0;
*p++ = used ? a->initialLayout : 0;
*p++ = used ? a->finalLayout : 0;
};
for (int i = 0, ie = colorRefs.count(); i != ie; ++i) {
const uint32_t attIdx = colorRefs[i].attachment;
*p++ = attIdx;
serializeAttachmentData(attDescs[attIdx], attIdx != VK_ATTACHMENT_UNUSED);
serializeAttachmentData(attIdx);
}
if (hasDepthStencil) {
const uint32_t attIdx = dsRef.attachment;
*p++ = attIdx;
serializeAttachmentData(attDescs[attIdx], attIdx != VK_ATTACHMENT_UNUSED);
serializeAttachmentData(attIdx);
}
for (int i = 0, ie = resolveRefs.count(); i != ie; ++i) {
const uint32_t attIdx = resolveRefs[i].attachment;
*p++ = attIdx;
serializeAttachmentData(attDescs[attIdx], attIdx != VK_ATTACHMENT_UNUSED);
serializeAttachmentData(attIdx);
}
}