rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-15 07:29:17 +01:00
Code Issues Projects Releases Wiki Activity

[dxvk] Use dynamic rendering directly for partial image view clears

Browse Source
This commit is contained in:
Philip Rebohle 2022-07-03 14:12:45 +02:00
parent f57a6d485b
commit f19607c11e
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 50 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/dxvk/dxvk_context.cpp
View File

@ -2992,6 +2992,10 @@ namespace dxvk {
VkClearValue value) { VkClearValue value) {
this->updateFramebuffer(); this->updateFramebuffer();
VkPipelineStageFlags clearStages = 0;
VkAccessFlags clearAccess = 0;
VkImageLayout clearLayout = VK_IMAGE_LAYOUT_UNDEFINED;
// Find out if the render target view is currently bound, // Find out if the render target view is currently bound,
// so that we can avoid spilling the render pass if it is. // so that we can avoid spilling the render pass if it is.
int32_t attachmentIndex = -1; int32_t attachmentIndex = -1;
@ -3005,53 +3009,57 @@ namespace dxvk {
if (attachmentIndex < 0) { if (attachmentIndex < 0) {
this->spillRenderPass(false); this->spillRenderPass(false);
if (m_execBarriers.isImageDirty( if (m_execBarriers.isImageDirty(imageView->image(), imageView->imageSubresources(), DxvkAccess::Write))
imageView->image(),
imageView->imageSubresources(),
DxvkAccess::Write))
m_execBarriers.recordCommands(m_cmd); m_execBarriers.recordCommands(m_cmd);
// Set up a temporary framebuffer clearLayout = (imageView->info().aspect & VK_IMAGE_ASPECT_COLOR_BIT)
DxvkRenderTargets attachments; ? imageView->pickLayout(VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL)
DxvkRenderPassOps ops; : imageView->pickLayout(VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);
VkPipelineStageFlags clearStages = 0; VkExtent3D extent = imageView->mipLevelExtent(0);
VkAccessFlags clearAccess = 0;
VkRenderingAttachmentInfoKHR attachmentInfo = { VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO_KHR };
attachmentInfo.imageView = imageView->handle();
attachmentInfo.imageLayout = clearLayout;
attachmentInfo.loadOp = VK_ATTACHMENT_LOAD_OP_LOAD;
attachmentInfo.storeOp = VK_ATTACHMENT_STORE_OP_STORE;
VkRenderingInfoKHR renderingInfo = { VK_STRUCTURE_TYPE_RENDERING_INFO_KHR };
renderingInfo.renderArea.extent = { extent.width, extent.height };
renderingInfo.layerCount = imageView->info().numLayers;
if (imageView->info().aspect & VK_IMAGE_ASPECT_COLOR_BIT) { if (imageView->info().aspect & VK_IMAGE_ASPECT_COLOR_BIT) {
clearStages |= VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; clearStages |= VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
clearAccess |= VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT clearAccess |= VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT
| VK_ACCESS_COLOR_ATTACHMENT_READ_BIT; | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT;
attachments.color[0].view = imageView; renderingInfo.colorAttachmentCount = 1;
attachments.color[0].layout = imageView->pickLayout(VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL); renderingInfo.pColorAttachments = &attachmentInfo;
ops.colorOps[0].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD;
ops.colorOps[0].loadLayout = imageView->imageInfo().layout;
ops.colorOps[0].storeLayout = imageView->imageInfo().layout;
} else { } else {
clearStages |= VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT clearStages |= VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT
| VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT; | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
clearAccess |= VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT clearAccess |= VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT
| VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT; | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT;
attachments.depth.view = imageView; if (imageView->info().aspect & VK_IMAGE_ASPECT_DEPTH_BIT)
attachments.depth.layout = imageView->pickLayout(VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL); renderingInfo.pDepthAttachment = &attachmentInfo;
ops.depthOps.loadOpD = VK_ATTACHMENT_LOAD_OP_LOAD; if (imageView->info().aspect & VK_IMAGE_ASPECT_STENCIL_BIT)
ops.depthOps.loadOpS = VK_ATTACHMENT_LOAD_OP_LOAD; renderingInfo.pStencilAttachment = &attachmentInfo;
ops.depthOps.loadLayout = imageView->imageInfo().layout;
ops.depthOps.storeLayout = imageView->imageInfo().layout;
} }
ops.barrier.srcStages = clearStages; if (clearLayout != imageView->imageInfo().layout) {
ops.barrier.srcAccess = clearAccess; m_execAcquires.accessImage(
ops.barrier.dstStages = imageView->imageInfo().stages; imageView->image(),
ops.barrier.dstAccess = imageView->imageInfo().access; imageView->imageSubresources(),
imageView->imageInfo().layout, clearStages, 0,
clearLayout, clearStages, clearAccess);
m_execAcquires.recordCommands(m_cmd);
}
// We cannot leverage render pass clears // We cannot leverage render pass clears
// because we clear only part of the view // because we clear only part of the view
this->renderPassBindFramebuffer(makeFramebufferInfo(attachments), ops, 0, nullptr); m_cmd->cmdBeginRendering(&renderingInfo);
} else { } else {
// Make sure the render pass is active so // Make sure the render pass is active so
// that we can actually perform the clear // that we can actually perform the clear
@ -3078,8 +3086,20 @@ namespace dxvk {
m_cmd->cmdClearAttachments(1, &clearInfo, 1, &clearRect); m_cmd->cmdClearAttachments(1, &clearInfo, 1, &clearRect);
// Unbind temporary framebuffer // Unbind temporary framebuffer
if (attachmentIndex < 0) if (attachmentIndex < 0) {
this->renderPassUnbindFramebuffer(); m_cmd->cmdEndRendering();
m_execBarriers.accessImage(
imageView->image(),
imageView->imageSubresources(),
clearLayout, clearStages, clearAccess,
imageView->imageInfo().layout,
imageView->imageInfo().stages,
imageView->imageInfo().access);
m_cmd->trackResource<DxvkAccess::None>(imageView);
m_cmd->trackResource<DxvkAccess::Write>(imageView->image());
}
} }