Skip to content

Fix possible undef values in storeOp trackers #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
solidpixel merged 1 commit into from
Dec 15, 2025
Merged

Fix possible undef values in storeOp trackers #162

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions source_common/trackers/render_pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ RenderPass::RenderPass(VkRenderPass _handle, const VkRenderPassCreateInfo& creat
auto& attachDesc = createInfo.pAttachments[attachRef.attachment];

// Canonicalize read-only attachments as storeOp=NONE
VkAttachmentStoreOp depthStoreOp;
VkAttachmentStoreOp depthStoreOp = attachDesc.storeOp;
switch (attachRef.layout)
{
case VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL:
Expand All @@ -136,14 +136,13 @@ RenderPass::RenderPass(VkRenderPass _handle, const VkRenderPassCreateInfo& creat
}
break;
default:
depthStoreOp = attachDesc.storeOp;
break;
}

attachments.emplace_back(RenderPassAttachName::DEPTH, attachDesc.loadOp, depthStoreOp, false);

// Canonicalize read-only attachments as storeOp=NONE
VkAttachmentStoreOp stencilStoreOp;
VkAttachmentStoreOp stencilStoreOp = attachDesc.stencilStoreOp;
switch (attachRef.layout)
{
case VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL:
Expand All @@ -155,7 +154,6 @@ RenderPass::RenderPass(VkRenderPass _handle, const VkRenderPassCreateInfo& creat
}
break;
default:
stencilStoreOp = attachDesc.stencilStoreOp;
break;
}

Expand Down Expand Up @@ -214,7 +212,7 @@ RenderPass::RenderPass(VkRenderPass _handle, const VkRenderPassCreateInfo2& crea
auto& attachDesc = createInfo.pAttachments[attachRef.attachment];

// Canonicalize read-only attachments as storeOp=NONE
VkAttachmentStoreOp depthStoreOp;
VkAttachmentStoreOp depthStoreOp = attachDesc.storeOp;
switch (attachRef.layout)
{
case VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL:
Expand All @@ -226,14 +224,13 @@ RenderPass::RenderPass(VkRenderPass _handle, const VkRenderPassCreateInfo2& crea
}
break;
default:
depthStoreOp = attachDesc.storeOp;
break;
}

attachments.emplace_back(RenderPassAttachName::DEPTH, attachDesc.loadOp, depthStoreOp, false);

// Canonicalize read-only attachments as storeOp=NONE
VkAttachmentStoreOp stencilStoreOp;
VkAttachmentStoreOp stencilStoreOp = attachDesc.stencilStoreOp;
switch (attachRef.layout)
{
case VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL:
Expand All @@ -245,7 +242,6 @@ RenderPass::RenderPass(VkRenderPass _handle, const VkRenderPassCreateInfo2& crea
}
break;
default:
stencilStoreOp = attachDesc.stencilStoreOp;
break;
}

Expand Down Expand Up @@ -294,7 +290,7 @@ RenderPass::RenderPass(const VkRenderingInfo& createInfo)
auto& attachRef = *createInfo.pDepthAttachment;

// Canonicalize read-only attachments as storeOp=NONE
VkAttachmentStoreOp depthStoreOp;
VkAttachmentStoreOp depthStoreOp = attachRef.storeOp;
switch (attachRef.imageLayout)
{
case VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL:
Expand All @@ -306,7 +302,6 @@ RenderPass::RenderPass(const VkRenderingInfo& createInfo)
}
break;
default:
depthStoreOp = attachRef.storeOp;
break;
}

Expand All @@ -328,7 +323,7 @@ RenderPass::RenderPass(const VkRenderingInfo& createInfo)
auto& attachRef = *createInfo.pStencilAttachment;

// Canonicalize read-only attachments as storeOp=NONE
VkAttachmentStoreOp stencilStoreOp;
VkAttachmentStoreOp stencilStoreOp = attachRef.storeOp;
switch (attachRef.imageLayout)
{
case VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL:
Expand All @@ -340,7 +335,6 @@ RenderPass::RenderPass(const VkRenderingInfo& createInfo)
}
break;
default:
stencilStoreOp = attachRef.storeOp;
break;
}

Expand Down