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

[dxvk] Use new barrier helpers in renderPassEmitInitBarriers

Browse Source
This commit is contained in:
Philip Rebohle 2024-10-12 10:08:22 +02:00 committed by Philip Rebohle
parent d00d0a39ce
commit 3d12c1aea5
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/dxvk/dxvk_context.cpp
View File

@ -4480,13 +4480,8 @@ namespace dxvk {
for (uint32_t i = 0; i < framebufferInfo.numAttachments(); i++) { for (uint32_t i = 0; i < framebufferInfo.numAttachments(); i++) {
const auto& attachment = framebufferInfo.getAttachment(i); const auto& attachment = framebufferInfo.getAttachment(i);
if (m_execBarriers.isImageDirty( flushPendingAccesses(*attachment.view->image(),
attachment.view->image(), attachment.view->imageSubresources(), DxvkAccess::Write);
attachment.view->imageSubresources(),
DxvkAccess::Write)) {
m_execBarriers.recordCommands(m_cmd);
break;
}
} }
// Transition all images to the render layout as necessary // Transition all images to the render layout as necessary
@ -4496,27 +4491,27 @@ namespace dxvk {
&& depthAttachment.view != nullptr) { && depthAttachment.view != nullptr) {
VkImageAspectFlags depthAspects = depthAttachment.view->info().aspects; VkImageAspectFlags depthAspects = depthAttachment.view->info().aspects;
VkPipelineStageFlags depthStages = VkPipelineStageFlags2 depthStages =
VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_2_EARLY_FRAGMENT_TESTS_BIT |
VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT; VK_PIPELINE_STAGE_2_LATE_FRAGMENT_TESTS_BIT;
VkAccessFlags depthAccess = 0; VkAccessFlags2 depthAccess = VK_ACCESS_2_NONE;
if (((depthAspects & VK_IMAGE_ASPECT_DEPTH_BIT) && ops.depthOps.loadOpD == VK_ATTACHMENT_LOAD_OP_LOAD) if (((depthAspects & VK_IMAGE_ASPECT_DEPTH_BIT) && ops.depthOps.loadOpD == VK_ATTACHMENT_LOAD_OP_LOAD)
|| ((depthAspects & VK_IMAGE_ASPECT_STENCIL_BIT) && ops.depthOps.loadOpS == VK_ATTACHMENT_LOAD_OP_LOAD)) || ((depthAspects & VK_IMAGE_ASPECT_STENCIL_BIT) && ops.depthOps.loadOpS == VK_ATTACHMENT_LOAD_OP_LOAD))
depthAccess |= VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT; depthAccess |= VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_READ_BIT;
if (((depthAspects & VK_IMAGE_ASPECT_DEPTH_BIT) && ops.depthOps.loadOpD != VK_ATTACHMENT_LOAD_OP_LOAD) if (((depthAspects & VK_IMAGE_ASPECT_DEPTH_BIT) && ops.depthOps.loadOpD != VK_ATTACHMENT_LOAD_OP_LOAD)
|| ((depthAspects & VK_IMAGE_ASPECT_STENCIL_BIT) && ops.depthOps.loadOpS != VK_ATTACHMENT_LOAD_OP_LOAD) || ((depthAspects & VK_IMAGE_ASPECT_STENCIL_BIT) && ops.depthOps.loadOpS != VK_ATTACHMENT_LOAD_OP_LOAD)
|| (depthAttachment.layout != VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL)) || (depthAttachment.layout != VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL))
depthAccess |= VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT; depthAccess |= VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
if (depthAttachment.layout != VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL) { if (depthAttachment.layout != VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL) {
depthStages |= m_device->getShaderPipelineStages(); depthStages |= m_device->getShaderPipelineStages();
depthAccess |= VK_ACCESS_SHADER_READ_BIT; depthAccess |= VK_ACCESS_2_SHADER_READ_BIT;
} }
m_execBarriers.accessImage( accessImage(DxvkCmdBuffer::ExecBuffer,
depthAttachment.view->image(), *depthAttachment.view->image(),
depthAttachment.view->imageSubresources(), depthAttachment.view->imageSubresources(),
ops.depthOps.loadLayout, ops.depthOps.loadLayout,
depthStages, 0, depthStages, 0,
@ -4529,18 +4524,18 @@ namespace dxvk {
if (colorAttachment.layout != ops.colorOps[i].loadLayout if (colorAttachment.layout != ops.colorOps[i].loadLayout
&& colorAttachment.view != nullptr) { && colorAttachment.view != nullptr) {
VkAccessFlags colorAccess = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; VkAccessFlags2 colorAccess = VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT;
if (ops.colorOps[i].loadOp == VK_ATTACHMENT_LOAD_OP_LOAD) if (ops.colorOps[i].loadOp == VK_ATTACHMENT_LOAD_OP_LOAD)
colorAccess |= VK_ACCESS_COLOR_ATTACHMENT_READ_BIT; colorAccess |= VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT;
m_execBarriers.accessImage( accessImage(DxvkCmdBuffer::ExecBuffer,
colorAttachment.view->image(), *colorAttachment.view->image(),
colorAttachment.view->imageSubresources(), colorAttachment.view->imageSubresources(),
ops.colorOps[i].loadLayout, ops.colorOps[i].loadLayout,
VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, 0, VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT, 0,
colorAttachment.layout, colorAttachment.layout,
VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT,
colorAccess); colorAccess);
} }
} }
@ -4548,7 +4543,7 @@ namespace dxvk {
// Unconditionally emit barriers here. We need to do this // Unconditionally emit barriers here. We need to do this
// even if there are no layout transitions, since we don't // even if there are no layout transitions, since we don't
// track resource usage during render passes. // track resource usage during render passes.
m_execBarriers.recordCommands(m_cmd); flushBarriers();
} }