Skip to content

Commit

Permalink
Use LOAD_OP_LOAD for DSV in swapchain load render pass (#469)
Browse files Browse the repository at this point in the history 
We create convenience render passes that write to swapchain images. One
set with LOAD_OP_CLEAR and one with LOAD_OP_LOAD. Previously
LOAD_OP_LOAD render passes used LOAD_OP_CLEAR for depth stencil
attachment, now we will use LOAD_OP_LOAD.

Tested by modifying dynamic rendering sample to use regular render
passes.

Fixes #467
  • Loading branch information
@apazylbe
apazylbe authored May 28, 2024
1 parent e0c7512 commit 7e8b8a7
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 15 deletions.
7 changes: 4 additions & 3 deletions include/ppx/grfx/grfx_swapchain.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,14 @@ class Swapchain
Result GetDepthImage(uint32_t imageIndex, grfx::Image** ppImage) const;
Result GetRenderPass(uint32_t imageIndex, grfx::AttachmentLoadOp loadOp, grfx::RenderPass** ppRenderPass) const;
Result GetRenderTargetView(uint32_t imageIndex, grfx::AttachmentLoadOp loadOp, grfx::RenderTargetView** ppView) const;
Result GetDepthStencilView(uint32_t imageIndex, grfx::DepthStencilView** ppView) const;
Result GetDepthStencilView(uint32_t imageIndex, grfx::AttachmentLoadOp loadOp, grfx::DepthStencilView** ppView) const;

// Convenience functions - returns empty object if index is invalid
grfx::ImagePtr GetColorImage(uint32_t imageIndex) const;
grfx::ImagePtr GetDepthImage(uint32_t imageIndex) const;
grfx::RenderPassPtr GetRenderPass(uint32_t imageIndex, grfx::AttachmentLoadOp loadOp = grfx::ATTACHMENT_LOAD_OP_CLEAR) const;
grfx::RenderTargetViewPtr GetRenderTargetView(uint32_t imageIndex, grfx::AttachmentLoadOp loadOp = grfx::ATTACHMENT_LOAD_OP_CLEAR) const;
grfx::DepthStencilViewPtr GetDepthStencilView(uint32_t imageIndex) const;
grfx::DepthStencilViewPtr GetDepthStencilView(uint32_t imageIndex, grfx::AttachmentLoadOp loadOp = grfx::ATTACHMENT_LOAD_OP_CLEAR) const;

Result AcquireNextImage(
uint64_t timeout, // Nanoseconds
Expand Down Expand Up @@ -218,7 +218,8 @@ class Swapchain
std::vector<grfx::ImagePtr> mColorImages;
std::vector<grfx::RenderTargetViewPtr> mClearRenderTargets;
std::vector<grfx::RenderTargetViewPtr> mLoadRenderTargets;
std::vector<grfx::DepthStencilViewPtr> mDepthStencilViews;
std::vector<grfx::DepthStencilViewPtr> mClearDepthStencilViews;
std::vector<grfx::DepthStencilViewPtr> mLoadDepthStencilViews;
std::vector<grfx::RenderPassPtr> mClearRenderPasses;
std::vector<grfx::RenderPassPtr> mLoadRenderPasses;

Expand Down
44 changes: 32 additions & 12 deletions src/ppx/grfx/grfx_swapchain.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,14 +221,25 @@ Result Swapchain::CreateRenderTargets()
dsvCreateInfo.ownership = ppx::grfx::OWNERSHIP_RESTRICTED;
dsvCreateInfo.arrayLayerCount = mCreateInfo.arrayLayerCount;

grfx::DepthStencilViewPtr dsv;
ppxres = GetDevice()->CreateDepthStencilView(&dsvCreateInfo, &dsv);
grfx::DepthStencilViewPtr clearDsv;
ppxres = GetDevice()->CreateDepthStencilView(&dsvCreateInfo, &clearDsv);
if (Failed(ppxres)) {
PPX_ASSERT_MSG(false, "grfx::Swapchain::CreateRenderTargets() for depth stencil view failed");
return ppxres;
}

mDepthStencilViews.push_back(dsv);
mClearDepthStencilViews.push_back(clearDsv);

dsvCreateInfo.depthLoadOp = ppx::grfx::ATTACHMENT_LOAD_OP_LOAD;
dsvCreateInfo.stencilLoadOp = ppx::grfx::ATTACHMENT_LOAD_OP_LOAD;
grfx::DepthStencilViewPtr loadDsv;
ppxres = GetDevice()->CreateDepthStencilView(&dsvCreateInfo, &loadDsv);
if (Failed(ppxres)) {
PPX_ASSERT_MSG(false, "grfx::Swapchain::CreateRenderTargets() for depth stencil view failed");
return ppxres;
}

mLoadDepthStencilViews.push_back(loadDsv);
}
}

Expand All @@ -247,7 +258,7 @@ Result Swapchain::CreateRenderPasses()
rpCreateInfo.height = mCreateInfo.height;
rpCreateInfo.renderTargetCount = 1;
rpCreateInfo.pRenderTargetViews[0] = mClearRenderTargets[i];
rpCreateInfo.pDepthStencilView = mDepthImages.empty() ? nullptr : mDepthStencilViews[i];
rpCreateInfo.pDepthStencilView = mDepthImages.empty() ? nullptr : mClearDepthStencilViews[i];
rpCreateInfo.renderTargetClearValues[0] = {{0.0f, 0.0f, 0.0f, 0.0f}};
rpCreateInfo.depthStencilClearValue = {1.0f, 0xFF};
rpCreateInfo.ownership = grfx::OWNERSHIP_RESTRICTED;
Expand Down Expand Up @@ -277,7 +288,7 @@ Result Swapchain::CreateRenderPasses()
rpCreateInfo.height = mCreateInfo.height;
rpCreateInfo.renderTargetCount = 1;
rpCreateInfo.pRenderTargetViews[0] = mLoadRenderTargets[i];
rpCreateInfo.pDepthStencilView = mDepthImages.empty() ? nullptr : mDepthStencilViews[i];
rpCreateInfo.pDepthStencilView = mDepthImages.empty() ? nullptr : mLoadDepthStencilViews[i];
rpCreateInfo.renderTargetClearValues[0] = {{0.0f, 0.0f, 0.0f, 0.0f}};
rpCreateInfo.depthStencilClearValue = {1.0f, 0xFF};
rpCreateInfo.ownership = grfx::OWNERSHIP_RESTRICTED;
Expand Down Expand Up @@ -312,10 +323,14 @@ void Swapchain::DestroyRenderTargets()
GetDevice()->DestroyRenderTargetView(rtv);
}
mLoadRenderTargets.clear();
for (auto& rtv : mDepthStencilViews) {
for (auto& rtv : mClearDepthStencilViews) {
GetDevice()->DestroyDepthStencilView(rtv);
}
mDepthStencilViews.clear();
mClearDepthStencilViews.clear();
for (auto& rtv : mLoadDepthStencilViews) {
GetDevice()->DestroyDepthStencilView(rtv);
}
mLoadDepthStencilViews.clear();
}

void Swapchain::DestroyRenderPasses()
Expand Down Expand Up @@ -390,12 +405,17 @@ Result Swapchain::GetRenderTargetView(uint32_t imageIndex, grfx::AttachmentLoadO
return ppx::SUCCESS;
}

Result Swapchain::GetDepthStencilView(uint32_t imageIndex, grfx::DepthStencilView** ppView) const
Result Swapchain::GetDepthStencilView(uint32_t imageIndex, grfx::AttachmentLoadOp loadOp, grfx::DepthStencilView** ppView) const
{
if (!IsIndexInRange(imageIndex, mDepthStencilViews)) {
if (!IsIndexInRange(imageIndex, mClearDepthStencilViews)) {
return ppx::ERROR_OUT_OF_RANGE;
}
*ppView = mDepthStencilViews[imageIndex];
if (loadOp == grfx::ATTACHMENT_LOAD_OP_CLEAR) {
*ppView = mClearDepthStencilViews[imageIndex];
}
else {
*ppView = mLoadDepthStencilViews[imageIndex];
}
return ppx::SUCCESS;
}

Expand Down Expand Up @@ -427,10 +447,10 @@ grfx::RenderTargetViewPtr Swapchain::GetRenderTargetView(uint32_t imageIndex, gr
return object;
}

grfx::DepthStencilViewPtr Swapchain::GetDepthStencilView(uint32_t imageIndex) const
grfx::DepthStencilViewPtr Swapchain::GetDepthStencilView(uint32_t imageIndex, grfx::AttachmentLoadOp loadOp) const
{
grfx::DepthStencilViewPtr object;
GetDepthStencilView(imageIndex, &object);
GetDepthStencilView(imageIndex, loadOp, &object);
return object;
}

Expand Down

0 comments on commit 7e8b8a7

Please sign in to comment.