rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-04-01 09:25:24 +02:00
Code Issues Projects Releases Wiki Activity

[dxvk] Prepare for supporting deferred clears during rendering

Browse Source
This commit is contained in:
Philip Rebohle 2025-03-21 00:51:01 +01:00
parent d6208bba65
commit 9cac7b0447
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/dxvk/dxvk_context.cpp
View File

@ -2502,8 +2502,10 @@ namespace dxvk {
auto srcSubresource = attachment.view->imageSubresources(); auto srcSubresource = attachment.view->imageSubresources();
auto dstSubresource = resolve.imageView->imageSubresources(); auto dstSubresource = resolve.imageView->imageSubresources();
prepareImage(attachment.view->image(), srcSubresource); // We're within a render pass, any pending clears will have happened
prepareImage(resolve.imageView->image(), dstSubresource); // after the resolve, so ignore them here.
prepareImage(attachment.view->image(), srcSubresource, false);
prepareImage(resolve.imageView->image(), dstSubresource, false);
while (resolve.layerMask) { while (resolve.layerMask) {
uint32_t layerIndex = bit::tzcnt(resolve.layerMask); uint32_t layerIndex = bit::tzcnt(resolve.layerMask);
@ -5084,10 +5086,6 @@ namespace dxvk {
const Rc<DxvkImage>& srcImage, const Rc<DxvkImage>& srcImage,
const VkImageResolve& region, const VkImageResolve& region,
VkFormat format) { VkFormat format) {
// Can't have pending clears if we're already inside a render pass
if (m_flags.test(DxvkContextFlag::GpRenderPassBound))
return false;
// If the destination image is only partially written, ignore // If the destination image is only partially written, ignore
if (dstImage->mipLevelExtent(region.dstSubresource.mipLevel, region.dstSubresource.aspectMask) != region.extent) if (dstImage->mipLevelExtent(region.dstSubresource.mipLevel, region.dstSubresource.aspectMask) != region.extent)
return false; return false;
@ -5118,6 +5116,10 @@ namespace dxvk {
if (!ensureImageCompatibility(dstImage, usage)) if (!ensureImageCompatibility(dstImage, usage))
return false; return false;
// End current render pass and prepare the destination image
spillRenderPass(true);
prepareImage(dstImage, vk::makeSubresourceRange(region.dstSubresource));
// Create an image view that we can use to perform the clear // Create an image view that we can use to perform the clear
DxvkImageViewKey key = { }; DxvkImageViewKey key = { };
key.viewType = VK_IMAGE_VIEW_TYPE_2D; key.viewType = VK_IMAGE_VIEW_TYPE_2D;
@ -5132,7 +5134,6 @@ namespace dxvk {
if (isDepthStencil) if (isDepthStencil)
key.aspects = dstImage->formatInfo()->aspectMask; key.aspects = dstImage->formatInfo()->aspectMask;
prepareImage(dstImage, vk::makeSubresourceRange(region.dstSubresource));
deferClear(dstImage->createView(key), region.dstSubresource.aspectMask, clear->clearValue); deferClear(dstImage->createView(key), region.dstSubresource.aspectMask, clear->clearValue);
return true; return true;
} }
@ -7910,6 +7911,10 @@ namespace dxvk {
if (!m_flags.test(DxvkContextFlag::GpRenderPassSecondaryCmd)) if (!m_flags.test(DxvkContextFlag::GpRenderPassSecondaryCmd))
return; return;
// Handling 3D is possible, but annoying, so skip it
if (image.info().type == VK_IMAGE_TYPE_3D)
return;
for (uint32_t i = 0; i < m_state.om.framebufferInfo.numAttachments(); i++) { for (uint32_t i = 0; i < m_state.om.framebufferInfo.numAttachments(); i++) {
auto& view = m_state.om.framebufferInfo.getAttachment(i).view; auto& view = m_state.om.framebufferInfo.getAttachment(i).view;