rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-03 22:24:13 +01:00
Code Issues Projects Releases Wiki Activity

[dxvk] Use new barrier helpers in renderPassEmitPostBarriers

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

64
src/dxvk/dxvk_context.cpp
View File

@ -4553,56 +4553,36 @@ namespace dxvk {
const auto& depthAttachment = framebufferInfo.getDepthTarget(); const auto& depthAttachment = framebufferInfo.getDepthTarget();
if (depthAttachment.view != nullptr) { if (depthAttachment.view != nullptr) {
if (depthAttachment.layout != ops.depthOps.storeLayout) { VkAccessFlags2 srcAccess = VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_READ_BIT;
m_execBarriers.accessImage(
depthAttachment.view->image(),
depthAttachment.view->imageSubresources(),
depthAttachment.layout,
VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT |
VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT,
VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT |
VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT,
ops.depthOps.storeLayout,
depthAttachment.view->image()->info().stages,
depthAttachment.view->image()->info().access);
} else {
VkAccessFlags srcAccess = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT;
if (depthAttachment.layout != VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL) if (depthAttachment.layout != VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL)
srcAccess |= VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT; srcAccess |= VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
m_execBarriers.accessMemory( accessImage(DxvkCmdBuffer::ExecBuffer,
VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | *depthAttachment.view->image(),
VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT, depthAttachment.view->imageSubresources(),
srcAccess, depthAttachment.layout,
depthAttachment.view->image()->info().stages, VK_PIPELINE_STAGE_2_EARLY_FRAGMENT_TESTS_BIT |
depthAttachment.view->image()->info().access); VK_PIPELINE_STAGE_2_LATE_FRAGMENT_TESTS_BIT,
} srcAccess, ops.depthOps.storeLayout,
depthAttachment.view->image()->info().stages,
depthAttachment.view->image()->info().access);
} }
for (uint32_t i = 0; i < MaxNumRenderTargets; i++) { for (uint32_t i = 0; i < MaxNumRenderTargets; i++) {
const auto& colorAttachment = framebufferInfo.getColorTarget(i); const auto& colorAttachment = framebufferInfo.getColorTarget(i);
if (colorAttachment.view != nullptr) { if (colorAttachment.view != nullptr) {
if (colorAttachment.layout != ops.colorOps[i].storeLayout) { accessImage(DxvkCmdBuffer::ExecBuffer,
m_execBarriers.accessImage( *colorAttachment.view->image(),
colorAttachment.view->image(), colorAttachment.view->imageSubresources(),
colorAttachment.view->imageSubresources(), colorAttachment.layout,
colorAttachment.layout, VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT,
VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT |
VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT,
VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, ops.colorOps[i].storeLayout,
ops.colorOps[i].storeLayout, colorAttachment.view->image()->info().stages,
colorAttachment.view->image()->info().stages, colorAttachment.view->image()->info().access);
colorAttachment.view->image()->info().access);
} else {
m_execBarriers.accessMemory(
VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
VK_ACCESS_COLOR_ATTACHMENT_READ_BIT |
VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
colorAttachment.view->image()->info().stages,
colorAttachment.view->image()->info().access);
}
} }
} }