niansa-misc/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-06 20:58:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

[dxvk] Pass store op around for barrier tracking

Browse source
This commit is contained in:
Philip Rebohle 2025-02-15 22:14:36 +01:00
parent 0bf4241d2a
commit 1db35951b5
2 changed files with 231 additions and 178 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

361
src/dxvk/dxvk_context.cpp
View file

@ -236,7 +236,7 @@ namespace dxvk {
accessImage(DxvkCmdBuffer::ExecBuffer, *image, subresources, accessImage(DxvkCmdBuffer::ExecBuffer, *image, subresources,
image->info().layout, image->info().stages, 0, image->info().layout, image->info().stages, 0,
layout, image->info().stages, image->info().access); layout, image->info().stages, image->info().access, DxvkAccessOp::None);
image->setLayout(layout); image->setLayout(layout);
@ -288,10 +288,9 @@ namespace dxvk {
&value); &value);
} }
accessBuffer(cmdBuffer, accessBuffer(cmdBuffer, *buffer, offset, length,
*buffer, offset, length, VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_WRITE_BIT,
VK_PIPELINE_STAGE_2_TRANSFER_BIT, DxvkAccessOp::None);
VK_ACCESS_2_TRANSFER_WRITE_BIT);
m_cmd->track(buffer, DxvkAccess::Write); m_cmd->track(buffer, DxvkAccess::Write);
} }
@ -361,7 +360,7 @@ namespace dxvk {
accessBuffer(cmdBuffer, *bufferView, accessBuffer(cmdBuffer, *bufferView,
VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT, VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT,
VK_ACCESS_2_SHADER_WRITE_BIT); VK_ACCESS_2_SHADER_WRITE_BIT, DxvkAccessOp::None);
if (unlikely(m_features.test(DxvkContextFeature::DebugUtils))) if (unlikely(m_features.test(DxvkContextFeature::DebugUtils)))
m_cmd->cmdEndDebugUtilsLabel(cmdBuffer); m_cmd->cmdEndDebugUtilsLabel(cmdBuffer);
@ -478,15 +477,13 @@ namespace dxvk {
m_cmd->cmdCopyBuffer(cmdBuffer, &copyInfo); m_cmd->cmdCopyBuffer(cmdBuffer, &copyInfo);
accessBuffer(cmdBuffer, accessBuffer(cmdBuffer, *srcBuffer, srcOffset, numBytes,
*srcBuffer, srcOffset, numBytes, VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_READ_BIT,
VK_PIPELINE_STAGE_2_TRANSFER_BIT, DxvkAccessOp::None);
VK_ACCESS_2_TRANSFER_READ_BIT);
accessBuffer(cmdBuffer, accessBuffer(cmdBuffer, *dstBuffer, dstOffset, numBytes,
*dstBuffer, dstOffset, numBytes, VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_WRITE_BIT,
VK_PIPELINE_STAGE_2_TRANSFER_BIT, DxvkAccessOp::None);
VK_ACCESS_2_TRANSFER_WRITE_BIT);
m_cmd->track(dstBuffer, DxvkAccess::Write); m_cmd->track(dstBuffer, DxvkAccess::Write);
m_cmd->track(srcBuffer, DxvkAccess::Read); m_cmd->track(srcBuffer, DxvkAccess::Read);
@ -818,10 +815,12 @@ namespace dxvk {
extent.depth); extent.depth);
accessBuffer(DxvkCmdBuffer::ExecBuffer, *dstView, accessBuffer(DxvkCmdBuffer::ExecBuffer, *dstView,
VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT, VK_ACCESS_2_SHADER_WRITE_BIT); VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT, VK_ACCESS_2_SHADER_WRITE_BIT,
DxvkAccessOp::None);
accessBuffer(DxvkCmdBuffer::ExecBuffer, *srcView, accessBuffer(DxvkCmdBuffer::ExecBuffer, *srcView,
VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT, VK_ACCESS_2_SHADER_READ_BIT); VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT, VK_ACCESS_2_SHADER_READ_BIT,
DxvkAccessOp::None);
// Track all involved resources // Track all involved resources
m_cmd->track(dstBuffer, DxvkAccess::Write); m_cmd->track(dstBuffer, DxvkAccess::Write);
@ -1123,7 +1122,7 @@ namespace dxvk {
if (initialLayout == VK_IMAGE_LAYOUT_PREINITIALIZED) { if (initialLayout == VK_IMAGE_LAYOUT_PREINITIALIZED) {
accessImage(DxvkCmdBuffer::InitBuffer, accessImage(DxvkCmdBuffer::InitBuffer,
*image, subresources, initialLayout, *image, subresources, initialLayout,
VK_PIPELINE_STAGE_2_NONE, 0); VK_PIPELINE_STAGE_2_NONE, 0, DxvkAccessOp::None);
m_cmd->track(image, DxvkAccess::None); m_cmd->track(image, DxvkAccess::None);
} else { } else {
@ -1202,10 +1201,8 @@ namespace dxvk {
} }
} }
accessImage(DxvkCmdBuffer::InitBuffer, accessImage(DxvkCmdBuffer::InitBuffer, *image, subresources, clearLayout,
*image, subresources, clearLayout, VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_WRITE_BIT, DxvkAccessOp::None);
VK_PIPELINE_STAGE_2_TRANSFER_BIT,
VK_ACCESS_2_TRANSFER_WRITE_BIT);
m_cmd->track(image, DxvkAccess::Write); m_cmd->track(image, DxvkAccess::Write);
} }
@ -1253,9 +1250,8 @@ namespace dxvk {
} }
// Perform initial layout transition // Perform initial layout transition
accessImage(DxvkCmdBuffer::InitBuffer, accessImage(DxvkCmdBuffer::InitBuffer, *image, image->getAvailableSubresources(),
*image, image->getAvailableSubresources(), VK_IMAGE_LAYOUT_UNDEFINED, VK_PIPELINE_STAGE_2_NONE, 0, DxvkAccessOp::None);
VK_IMAGE_LAYOUT_UNDEFINED, VK_PIPELINE_STAGE_2_NONE, 0);
m_cmd->track(image, DxvkAccess::Write); m_cmd->track(image, DxvkAccess::Write);
} }
@ -1293,7 +1289,8 @@ namespace dxvk {
accessBuffer(DxvkCmdBuffer::ExecBuffer, accessBuffer(DxvkCmdBuffer::ExecBuffer,
*resource, 0, resource->info().size, *resource, 0, resource->info().size,
srcStages, srcAccess, dstStages, dstAccess); srcStages, srcAccess, dstStages, dstAccess,
DxvkAccessOp::None);
m_cmd->track(resource, DxvkAccess::Write); m_cmd->track(resource, DxvkAccess::Write);
} }
@ -1315,7 +1312,8 @@ namespace dxvk {
accessImage(DxvkCmdBuffer::ExecBuffer, accessImage(DxvkCmdBuffer::ExecBuffer,
*resource, resource->getAvailableSubresources(), *resource, resource->getAvailableSubresources(),
srcLayout, srcStages, srcAccess, srcLayout, srcStages, srcAccess,
dstLayout, dstStages, dstAccess); dstLayout, dstStages, dstAccess,
DxvkAccessOp::None);
m_cmd->track(resource, DxvkAccess::Write); m_cmd->track(resource, DxvkAccess::Write);
} }
@ -1472,19 +1470,22 @@ namespace dxvk {
VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT | VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT |
VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT, VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT,
VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT |
VK_ACCESS_2_SHADER_READ_BIT); VK_ACCESS_2_SHADER_READ_BIT,
DxvkAccessOp::None);
} else { } else {
accessImage(DxvkCmdBuffer::ExecBuffer, accessImage(DxvkCmdBuffer::ExecBuffer,
*imageView->image(), mipGenerator.getAllSourceSubresources(), srcLayout, *imageView->image(), mipGenerator.getAllSourceSubresources(), srcLayout,
VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT | VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT |
VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT, VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT,
VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT |
VK_ACCESS_2_SHADER_READ_BIT); VK_ACCESS_2_SHADER_READ_BIT,
DxvkAccessOp::None);
accessImage(DxvkCmdBuffer::ExecBuffer, accessImage(DxvkCmdBuffer::ExecBuffer,
*imageView->image(), mipGenerator.getBottomSubresource(), dstLayout, *imageView->image(), mipGenerator.getBottomSubresource(), dstLayout,
VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT,
VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT); VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT,
DxvkAccessOp::None);
} }
if (unlikely(m_features.test(DxvkContextFeature::DebugUtils))) if (unlikely(m_features.test(DxvkContextFeature::DebugUtils)))
@ -1584,7 +1585,7 @@ namespace dxvk {
// If the image has any pending layout transitions, flush them accordingly. // If the image has any pending layout transitions, flush them accordingly.
// There might be false positives here, but those do not affect correctness. // There might be false positives here, but those do not affect correctness.
if (resourceHasAccess(*image, image->getAvailableSubresources(), DxvkAccess::Write)) { if (resourceHasAccess(*image, image->getAvailableSubresources(), DxvkAccess::Write, DxvkAccessOp::None)) {
spillRenderPass(true); spillRenderPass(true);
flushBarriers(); flushBarriers();
@ -1652,7 +1653,8 @@ namespace dxvk {
accessImage(DxvkCmdBuffer::ExecBuffer, *image, image->getAvailableSubresources(), accessImage(DxvkCmdBuffer::ExecBuffer, *image, image->getAvailableSubresources(),
oldLayout, image->info().stages, image->info().access, oldLayout, image->info().stages, image->info().access,
newLayout, image->info().stages, image->info().access); newLayout, image->info().stages, image->info().access,
DxvkAccessOp::None);
m_cmd->track(image, DxvkAccess::Write); m_cmd->track(image, DxvkAccess::Write);
return true; return true;
@ -1863,7 +1865,8 @@ namespace dxvk {
accessImage(DxvkCmdBuffer::ExecBuffer, accessImage(DxvkCmdBuffer::ExecBuffer,
*dstImage, dstSubresources, *dstImage, dstSubresources,
srcLayout, dstImage->info().stages, dstImage->info().access, srcLayout, dstImage->info().stages, dstImage->info().access,
dstLayout, dstImage->info().stages, dstImage->info().access); dstLayout, dstImage->info().stages, dstImage->info().access,
DxvkAccessOp::None);
m_cmd->track(dstImage, DxvkAccess::Write); m_cmd->track(dstImage, DxvkAccess::Write);
} }
@ -2029,7 +2032,7 @@ namespace dxvk {
*imageView->image(), imageView->imageSubresources(), *imageView->image(), imageView->imageSubresources(),
imageLayout, clearStages, clearAccess, storeLayout, imageLayout, clearStages, clearAccess, storeLayout,
imageView->image()->info().stages, imageView->image()->info().stages,
imageView->image()->info().access); imageView->image()->info().access, DxvkAccessOp::None);
if (unlikely(m_features.test(DxvkContextFeature::DebugUtils))) if (unlikely(m_features.test(DxvkContextFeature::DebugUtils)))
m_cmd->cmdEndDebugUtilsLabel(DxvkCmdBuffer::ExecBuffer); m_cmd->cmdEndDebugUtilsLabel(DxvkCmdBuffer::ExecBuffer);
@ -2232,7 +2235,7 @@ namespace dxvk {
// Record layout transition from attachment layout back to default // Record layout transition from attachment layout back to default
// layout. This will be flushed after the render pass has ended. // layout. This will be flushed after the render pass has ended.
accessImage(DxvkCmdBuffer::ExecBuffer, *dstImage, accessImage(DxvkCmdBuffer::ExecBuffer, *dstImage,
dstSubresource, newLayout, stages, access); dstSubresource, newLayout, stages, access, DxvkAccessOp::None);
if (!isDepthStencil) { if (!isDepthStencil) {
uint32_t index = m_state.om.framebufferInfo.getColorAttachmentIndex(i); uint32_t index = m_state.om.framebufferInfo.getColorAttachmentIndex(i);
@ -2343,7 +2346,7 @@ namespace dxvk {
accessBuffer(cmdBuffer, *buffer, offset, size, accessBuffer(cmdBuffer, *buffer, offset, size,
VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_PIPELINE_STAGE_2_TRANSFER_BIT,
VK_ACCESS_2_TRANSFER_WRITE_BIT); VK_ACCESS_2_TRANSFER_WRITE_BIT, DxvkAccessOp::None);
m_cmd->track(buffer, DxvkAccess::Write); m_cmd->track(buffer, DxvkAccess::Write);
} }
@ -2794,7 +2797,8 @@ namespace dxvk {
accessBuffer(DxvkCmdBuffer::ExecBuffer, accessBuffer(DxvkCmdBuffer::ExecBuffer,
*r.first, 0, r.first->info().size, *r.first, 0, r.first->info().size,
VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT, accessFlags); VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT,
accessFlags, DxvkAccessOp::None);
m_cmd->track(r.first, r.second.test(DxvkAccess::Write) ? DxvkAccess::Write : DxvkAccess::Read); m_cmd->track(r.first, r.second.test(DxvkAccess::Write) ? DxvkAccess::Write : DxvkAccess::Read);
} }
@ -2804,7 +2808,7 @@ namespace dxvk {
| (r.second.test(DxvkAccess::Write) * VK_ACCESS_SHADER_WRITE_BIT); | (r.second.test(DxvkAccess::Write) * VK_ACCESS_SHADER_WRITE_BIT);
accessImage(DxvkCmdBuffer::ExecBuffer, *r.first, accessImage(DxvkCmdBuffer::ExecBuffer, *r.first,
r.first->getAvailableSubresources(), r.first->info().layout, r.first->getAvailableSubresources(), r.first->info().layout,
VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT, accessFlags); VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT, accessFlags, DxvkAccessOp::None);
m_cmd->track(r.first, r.second.test(DxvkAccess::Write) ? DxvkAccess::Write : DxvkAccess::Read); m_cmd->track(r.first, r.second.test(DxvkAccess::Write) ? DxvkAccess::Write : DxvkAccess::Read);
} }
@ -3089,12 +3093,12 @@ namespace dxvk {
accessImage(DxvkCmdBuffer::ExecBuffer, accessImage(DxvkCmdBuffer::ExecBuffer,
*dstView->image(), dstView->imageSubresources(), dstLayout, *dstView->image(), dstView->imageSubresources(), dstLayout,
VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT,
VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT); VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT, DxvkAccessOp::None);
accessImage(DxvkCmdBuffer::ExecBuffer, accessImage(DxvkCmdBuffer::ExecBuffer,
*srcView->image(), srcView->imageSubresources(), srcLayout, *srcView->image(), srcView->imageSubresources(), srcLayout,
VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT, VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT,
VK_ACCESS_2_SHADER_READ_BIT); VK_ACCESS_2_SHADER_READ_BIT, DxvkAccessOp::None);
if (unlikely(m_features.test(DxvkContextFeature::DebugUtils))) if (unlikely(m_features.test(DxvkContextFeature::DebugUtils)))
m_cmd->cmdEndDebugUtilsLabel(DxvkCmdBuffer::ExecBuffer); m_cmd->cmdEndDebugUtilsLabel(DxvkCmdBuffer::ExecBuffer);
@ -3144,14 +3148,12 @@ namespace dxvk {
blitInfo.filter = filter; blitInfo.filter = filter;
m_cmd->cmdBlitImage(&blitInfo); m_cmd->cmdBlitImage(&blitInfo);
accessImage(DxvkCmdBuffer::ExecBuffer, accessImage(DxvkCmdBuffer::ExecBuffer, *dstView->image(), dstView->imageSubresources(), dstLayout,
*dstView->image(), dstView->imageSubresources(), dstLayout, VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_WRITE_BIT, DxvkAccessOp::None);
VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_WRITE_BIT);
accessImage(DxvkCmdBuffer::ExecBuffer, *srcView->image(), srcView->imageSubresources(), srcLayout,
accessImage(DxvkCmdBuffer::ExecBuffer, VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_READ_BIT, DxvkAccessOp::None);
*srcView->image(), srcView->imageSubresources(), srcLayout,
VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_READ_BIT);
m_cmd->track(dstView->image(), DxvkAccess::Write); m_cmd->track(dstView->image(), DxvkAccess::Write);
m_cmd->track(srcView->image(), DxvkAccess::Read); m_cmd->track(srcView->image(), DxvkAccess::Read);
@ -3302,10 +3304,10 @@ namespace dxvk {
bufferSlice, bufferRowAlignment, bufferSliceAlignment); bufferSlice, bufferRowAlignment, bufferSliceAlignment);
accessImage(cmdBuffer, *image, dstSubresourceRange, dstImageLayoutTransfer, accessImage(cmdBuffer, *image, dstSubresourceRange, dstImageLayoutTransfer,
VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_WRITE_BIT); VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_WRITE_BIT, DxvkAccessOp::None);
accessBuffer(cmdBuffer, *buffer, bufferOffset, dataSize, accessBuffer(cmdBuffer, *buffer, bufferOffset, dataSize,
VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_READ_BIT); VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_READ_BIT, DxvkAccessOp::None);
m_cmd->track(image, DxvkAccess::Write); m_cmd->track(image, DxvkAccess::Write);
m_cmd->track(buffer, DxvkAccess::Read); m_cmd->track(buffer, DxvkAccess::Read);
@ -3541,11 +3543,11 @@ namespace dxvk {
accessImage(DxvkCmdBuffer::ExecBuffer, accessImage(DxvkCmdBuffer::ExecBuffer,
*image, vk::makeSubresourceRange(imageSubresource), *image, vk::makeSubresourceRange(imageSubresource),
imageLayout, stages, access); imageLayout, stages, access, DxvkAccessOp::None);
accessBuffer(DxvkCmdBuffer::ExecBuffer, *bufferView, accessBuffer(DxvkCmdBuffer::ExecBuffer, *bufferView,
VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT, VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT,
VK_ACCESS_2_SHADER_READ_BIT); VK_ACCESS_2_SHADER_READ_BIT, DxvkAccessOp::None);
if (unlikely(m_features.test(DxvkContextFeature::DebugUtils))) if (unlikely(m_features.test(DxvkContextFeature::DebugUtils)))
m_cmd->cmdEndDebugUtilsLabel(DxvkCmdBuffer::ExecBuffer); m_cmd->cmdEndDebugUtilsLabel(DxvkCmdBuffer::ExecBuffer);
@ -3593,12 +3595,11 @@ namespace dxvk {
image, imageSubresource, imageOffset, imageExtent, srcImageLayoutTransfer, image, imageSubresource, imageOffset, imageExtent, srcImageLayoutTransfer,
bufferSlice, bufferRowAlignment, bufferSliceAlignment); bufferSlice, bufferRowAlignment, bufferSliceAlignment);
accessImage(DxvkCmdBuffer::ExecBuffer, accessImage(DxvkCmdBuffer::ExecBuffer, *image, srcSubresourceRange, srcImageLayoutTransfer,
*image, srcSubresourceRange, srcImageLayoutTransfer, VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_READ_BIT, DxvkAccessOp::None);
VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_READ_BIT);
accessBuffer(DxvkCmdBuffer::ExecBuffer, *buffer, bufferOffset, dataSize, accessBuffer(DxvkCmdBuffer::ExecBuffer, *buffer, bufferOffset, dataSize,
VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_WRITE_BIT); VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_WRITE_BIT, DxvkAccessOp::None);
m_cmd->track(buffer, DxvkAccess::Write); m_cmd->track(buffer, DxvkAccess::Write);
m_cmd->track(image, DxvkAccess::Read); m_cmd->track(image, DxvkAccess::Read);
@ -3769,11 +3770,10 @@ namespace dxvk {
workgroupCount.depth); workgroupCount.depth);
accessBuffer(DxvkCmdBuffer::ExecBuffer, *bufferView, accessBuffer(DxvkCmdBuffer::ExecBuffer, *bufferView,
VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT, VK_ACCESS_2_SHADER_WRITE_BIT); VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT, VK_ACCESS_2_SHADER_WRITE_BIT, DxvkAccessOp::None);
accessImage(DxvkCmdBuffer::ExecBuffer, *image, accessImage(DxvkCmdBuffer::ExecBuffer, *image, vk::makeSubresourceRange(imageSubresource), imageLayout,
vk::makeSubresourceRange(imageSubresource), imageLayout, VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT, VK_ACCESS_2_SHADER_READ_BIT, DxvkAccessOp::None);
VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT, VK_ACCESS_2_SHADER_READ_BIT);
m_flags.set(DxvkContextFlag::ForceWriteAfterWriteSync); m_flags.set(DxvkContextFlag::ForceWriteAfterWriteSync);
@ -3894,7 +3894,7 @@ namespace dxvk {
accessImage(DxvkCmdBuffer::ExecBuffer, accessImage(DxvkCmdBuffer::ExecBuffer,
*imageView->image(), imageView->imageSubresources(), *imageView->image(), imageView->imageSubresources(),
clearLayout, clearStages, clearAccess); clearLayout, clearStages, clearAccess, DxvkAccessOp::None);
if (unlikely(m_features.test(DxvkContextFeature::DebugUtils))) if (unlikely(m_features.test(DxvkContextFeature::DebugUtils)))
m_cmd->cmdEndDebugUtilsLabel(DxvkCmdBuffer::ExecBuffer); m_cmd->cmdEndDebugUtilsLabel(DxvkCmdBuffer::ExecBuffer);
@ -3983,10 +3983,9 @@ namespace dxvk {
m_cmd->cmdDispatch(cmdBuffer, m_cmd->cmdDispatch(cmdBuffer,
workgroups.width, workgroups.height, workgroups.depth); workgroups.width, workgroups.height, workgroups.depth);
accessImage(cmdBuffer, accessImage(cmdBuffer, *imageView->image(), imageView->imageSubresources(),
*imageView->image(), imageView->imageSubresources(),
VK_IMAGE_LAYOUT_GENERAL, VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT, VK_IMAGE_LAYOUT_GENERAL, VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT,
VK_ACCESS_2_SHADER_WRITE_BIT); VK_ACCESS_2_SHADER_WRITE_BIT, DxvkAccessOp::None);
if (cmdBuffer == DxvkCmdBuffer::ExecBuffer) if (cmdBuffer == DxvkCmdBuffer::ExecBuffer)
m_flags.set(DxvkContextFlag::ForceWriteAfterWriteSync); m_flags.set(DxvkContextFlag::ForceWriteAfterWriteSync);
@ -4057,13 +4056,11 @@ namespace dxvk {
m_cmd->cmdCopyImage(DxvkCmdBuffer::ExecBuffer, &copyInfo); m_cmd->cmdCopyImage(DxvkCmdBuffer::ExecBuffer, &copyInfo);
} }
accessImage(DxvkCmdBuffer::ExecBuffer, accessImage(DxvkCmdBuffer::ExecBuffer, *dstImage, dstSubresourceRange, dstImageLayout,
*dstImage, dstSubresourceRange, dstImageLayout, VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_WRITE_BIT, DxvkAccessOp::None);
VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_WRITE_BIT);
accessImage(DxvkCmdBuffer::ExecBuffer, accessImage(DxvkCmdBuffer::ExecBuffer, *srcImage, srcSubresourceRange, srcImageLayout,
*srcImage, srcSubresourceRange, srcImageLayout, VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_READ_BIT, DxvkAccessOp::None);
VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_READ_BIT);
m_cmd->track(dstImage, DxvkAccess::Write); m_cmd->track(dstImage, DxvkAccess::Write);
m_cmd->track(srcImage, DxvkAccess::Read); m_cmd->track(srcImage, DxvkAccess::Read);
@ -4259,14 +4256,12 @@ namespace dxvk {
m_cmd->cmdDraw(3, dstSubresource.layerCount, 0, 0); m_cmd->cmdDraw(3, dstSubresource.layerCount, 0, 0);
m_cmd->cmdEndRendering(); m_cmd->cmdEndRendering();
accessImage(DxvkCmdBuffer::ExecBuffer, accessImage(DxvkCmdBuffer::ExecBuffer, *srcImage, srcSubresourceRange,
*srcImage, srcSubresourceRange, srcLayout, srcLayout, VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT,
VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT, VK_ACCESS_2_SHADER_READ_BIT, DxvkAccessOp::None);
VK_ACCESS_2_SHADER_READ_BIT);
accessImage(DxvkCmdBuffer::ExecBuffer, accessImage(DxvkCmdBuffer::ExecBuffer, *dstImage, dstSubresourceRange,
*dstImage, dstSubresourceRange, dstLayout, dstStages, dstAccess, DxvkAccessOp::None);
dstLayout, dstStages, dstAccess);
if (unlikely(m_features.test(DxvkContextFeature::DebugUtils))) if (unlikely(m_features.test(DxvkContextFeature::DebugUtils)))
m_cmd->cmdEndDebugUtilsLabel(DxvkCmdBuffer::ExecBuffer); m_cmd->cmdEndDebugUtilsLabel(DxvkCmdBuffer::ExecBuffer);
@ -4357,7 +4352,8 @@ namespace dxvk {
accessBuffer(DxvkCmdBuffer::ExecBuffer, *buffer, accessBuffer(DxvkCmdBuffer::ExecBuffer, *buffer,
offset, SparseMemoryPageSize * pageCount, offset, SparseMemoryPageSize * pageCount,
VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_PIPELINE_STAGE_2_TRANSFER_BIT,
ToBuffer ? VK_ACCESS_2_TRANSFER_WRITE_BIT : VK_ACCESS_2_TRANSFER_READ_BIT); ToBuffer ? VK_ACCESS_2_TRANSFER_WRITE_BIT : VK_ACCESS_2_TRANSFER_READ_BIT,
DxvkAccessOp::None);
} }
@ -4406,7 +4402,8 @@ namespace dxvk {
accessBuffer(DxvkCmdBuffer::ExecBuffer, accessBuffer(DxvkCmdBuffer::ExecBuffer,
*sparse, 0, sparse->info().size, VK_PIPELINE_STAGE_2_TRANSFER_BIT, *sparse, 0, sparse->info().size, VK_PIPELINE_STAGE_2_TRANSFER_BIT,
ToBuffer ? VK_ACCESS_2_TRANSFER_READ_BIT : VK_ACCESS_2_TRANSFER_WRITE_BIT); ToBuffer ? VK_ACCESS_2_TRANSFER_READ_BIT : VK_ACCESS_2_TRANSFER_WRITE_BIT,
DxvkAccessOp::None);
m_cmd->track(sparse, ToBuffer ? DxvkAccess::Read : DxvkAccess::Write); m_cmd->track(sparse, ToBuffer ? DxvkAccess::Read : DxvkAccess::Write);
m_cmd->track(buffer, ToBuffer ? DxvkAccess::Write : DxvkAccess::Read); m_cmd->track(buffer, ToBuffer ? DxvkAccess::Write : DxvkAccess::Read);
@ -4484,7 +4481,7 @@ namespace dxvk {
accessImage(DxvkCmdBuffer::ExecBuffer, accessImage(DxvkCmdBuffer::ExecBuffer,
*sparse, sparseSubresources, transferLayout, *sparse, sparseSubresources, transferLayout,
VK_PIPELINE_STAGE_2_TRANSFER_BIT, transferAccess); VK_PIPELINE_STAGE_2_TRANSFER_BIT, transferAccess, DxvkAccessOp::None);
m_cmd->track(sparse, ToBuffer ? DxvkAccess::Read : DxvkAccess::Write); m_cmd->track(sparse, ToBuffer ? DxvkAccess::Read : DxvkAccess::Write);
m_cmd->track(buffer, ToBuffer ? DxvkAccess::Write : DxvkAccess::Read); m_cmd->track(buffer, ToBuffer ? DxvkAccess::Write : DxvkAccess::Read);
@ -4533,12 +4530,12 @@ namespace dxvk {
accessImage(DxvkCmdBuffer::ExecBuffer, accessImage(DxvkCmdBuffer::ExecBuffer,
*dstImage, dstSubresourceRange, dstLayout, *dstImage, dstSubresourceRange, dstLayout,
VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_PIPELINE_STAGE_2_TRANSFER_BIT,
VK_ACCESS_2_TRANSFER_WRITE_BIT); VK_ACCESS_2_TRANSFER_WRITE_BIT, DxvkAccessOp::None);
accessImage(DxvkCmdBuffer::ExecBuffer, accessImage(DxvkCmdBuffer::ExecBuffer,
*srcImage, srcSubresourceRange, srcLayout, *srcImage, srcSubresourceRange, srcLayout,
VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_PIPELINE_STAGE_2_TRANSFER_BIT,
VK_ACCESS_2_TRANSFER_READ_BIT); VK_ACCESS_2_TRANSFER_READ_BIT, DxvkAccessOp::None);
m_cmd->track(dstImage, DxvkAccess::Write); m_cmd->track(dstImage, DxvkAccess::Write);
m_cmd->track(srcImage, DxvkAccess::Read); m_cmd->track(srcImage, DxvkAccess::Read);
@ -4631,13 +4628,15 @@ namespace dxvk {
*srcImage, srcSubresourceRange, srcLayout, *srcImage, srcSubresourceRange, srcLayout,
VK_PIPELINE_STAGE_2_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_2_EARLY_FRAGMENT_TESTS_BIT |
VK_PIPELINE_STAGE_2_LATE_FRAGMENT_TESTS_BIT, VK_PIPELINE_STAGE_2_LATE_FRAGMENT_TESTS_BIT,
VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_READ_BIT); VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_READ_BIT,
DxvkAccessOp::None);
accessImage(DxvkCmdBuffer::ExecBuffer, accessImage(DxvkCmdBuffer::ExecBuffer,
*dstImage, dstSubresourceRange, dstLayout, *dstImage, dstSubresourceRange, dstLayout,
VK_PIPELINE_STAGE_2_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_2_EARLY_FRAGMENT_TESTS_BIT |
VK_PIPELINE_STAGE_2_LATE_FRAGMENT_TESTS_BIT, VK_PIPELINE_STAGE_2_LATE_FRAGMENT_TESTS_BIT,
VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT); VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT,
DxvkAccessOp::None);
if (unlikely(m_features.test(DxvkContextFeature::DebugUtils))) if (unlikely(m_features.test(DxvkContextFeature::DebugUtils)))
m_cmd->cmdEndDebugUtilsLabel(DxvkCmdBuffer::ExecBuffer); m_cmd->cmdEndDebugUtilsLabel(DxvkCmdBuffer::ExecBuffer);
@ -4844,14 +4843,12 @@ namespace dxvk {
m_cmd->cmdDraw(3, region.dstSubresource.layerCount, 0, 0); m_cmd->cmdDraw(3, region.dstSubresource.layerCount, 0, 0);
m_cmd->cmdEndRendering(); m_cmd->cmdEndRendering();
accessImage(DxvkCmdBuffer::ExecBuffer, accessImage(DxvkCmdBuffer::ExecBuffer, *srcImage, srcSubresourceRange,
*srcImage, srcSubresourceRange, srcLayout, srcLayout, VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT,
VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT, VK_ACCESS_2_SHADER_READ_BIT, DxvkAccessOp::None);
VK_ACCESS_2_SHADER_READ_BIT);
accessImage(DxvkCmdBuffer::ExecBuffer, accessImage(DxvkCmdBuffer::ExecBuffer, *dstImage, dstSubresourceRange,
*dstImage, dstSubresourceRange, dstLayout, dstStages, dstAccess, DxvkAccessOp::None);
dstLayout, dstStages, dstAccess);
if (unlikely(m_features.test(DxvkContextFeature::DebugUtils))) if (unlikely(m_features.test(DxvkContextFeature::DebugUtils)))
m_cmd->cmdEndDebugUtilsLabel(DxvkCmdBuffer::ExecBuffer); m_cmd->cmdEndDebugUtilsLabel(DxvkCmdBuffer::ExecBuffer);
@ -5148,9 +5145,9 @@ namespace dxvk {
m_initBarriers.addImageBarrier(barrier); m_initBarriers.addImageBarrier(barrier);
} else { } else {
accessImage(DxvkCmdBuffer::SdmaBuffer, accessImage(DxvkCmdBuffer::SdmaBuffer, *image, image->getAvailableSubresources(),
*image, image->getAvailableSubresources(), transferLayout, transferLayout, VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_WRITE_BIT,
VK_PIPELINE_STAGE_2_TRANSFER_BIT, VK_ACCESS_2_TRANSFER_WRITE_BIT); DxvkAccessOp::None);
} }
m_cmd->track(source, DxvkAccess::Read); m_cmd->track(source, DxvkAccess::Read);
@ -5296,7 +5293,7 @@ namespace dxvk {
ops.depthOps.loadLayout, ops.depthOps.loadLayout,
depthStages, 0, depthStages, 0,
depthAttachment.layout, depthAttachment.layout,
depthStages, depthAccess); depthStages, depthAccess, DxvkAccessOp::None);
} }
for (uint32_t i = 0; i < MaxNumRenderTargets; i++) { for (uint32_t i = 0; i < MaxNumRenderTargets; i++) {
@ -5316,7 +5313,7 @@ namespace dxvk {
VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT, 0, VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT, 0,
colorAttachment.layout, colorAttachment.layout,
VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT,
colorAccess); colorAccess, DxvkAccessOp::None);
} }
} }
@ -5346,7 +5343,8 @@ namespace dxvk {
VK_PIPELINE_STAGE_2_LATE_FRAGMENT_TESTS_BIT, VK_PIPELINE_STAGE_2_LATE_FRAGMENT_TESTS_BIT,
srcAccess, ops.depthOps.storeLayout, srcAccess, ops.depthOps.storeLayout,
depthAttachment.view->image()->info().stages, depthAttachment.view->image()->info().stages,
depthAttachment.view->image()->info().access); depthAttachment.view->image()->info().access,
DxvkAccessOp::None);
} }
for (uint32_t i = 0; i < MaxNumRenderTargets; i++) { for (uint32_t i = 0; i < MaxNumRenderTargets; i++) {
@ -5362,7 +5360,8 @@ namespace dxvk {
VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT, VK_ACCESS_2_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,
DxvkAccessOp::None);
} }
} }
@ -5583,7 +5582,8 @@ namespace dxvk {
accessBuffer(DxvkCmdBuffer::ExecBuffer, m_state.xfb.activeCounters[i], accessBuffer(DxvkCmdBuffer::ExecBuffer, m_state.xfb.activeCounters[i],
VK_PIPELINE_STAGE_2_TRANSFORM_FEEDBACK_BIT_EXT, VK_PIPELINE_STAGE_2_TRANSFORM_FEEDBACK_BIT_EXT,
VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT | VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT |
VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT); VK_ACCESS_2_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT,
DxvkAccessOp::None);
m_cmd->track(m_state.xfb.activeCounters[i].buffer(), DxvkAccess::Write); m_cmd->track(m_state.xfb.activeCounters[i].buffer(), DxvkAccess::Write);
} }
@ -5968,7 +5968,7 @@ namespace dxvk {
descriptorInfo.image.imageLayout = res.imageView->image()->info().layout; descriptorInfo.image.imageLayout = res.imageView->image()->info().layout;
if (BindPoint == VK_PIPELINE_BIND_POINT_COMPUTE || unlikely(res.imageView->image()->hasGfxStores())) if (BindPoint == VK_PIPELINE_BIND_POINT_COMPUTE || unlikely(res.imageView->image()->hasGfxStores()))
accessImage(DxvkCmdBuffer::ExecBuffer, *res.imageView, util::pipelineStages(binding.stage), binding.access); accessImage(DxvkCmdBuffer::ExecBuffer, *res.imageView, util::pipelineStages(binding.stage), binding.access, DxvkAccessOp::None);
m_cmd->track(res.imageView->image(), DxvkAccess::Read); m_cmd->track(res.imageView->image(), DxvkAccess::Read);
} else { } else {
@ -5992,7 +5992,7 @@ namespace dxvk {
descriptorInfo.image.imageLayout = res.imageView->image()->info().layout; descriptorInfo.image.imageLayout = res.imageView->image()->info().layout;
if (BindPoint == VK_PIPELINE_BIND_POINT_COMPUTE || res.imageView->image()->hasGfxStores()) if (BindPoint == VK_PIPELINE_BIND_POINT_COMPUTE || res.imageView->image()->hasGfxStores())
accessImage(DxvkCmdBuffer::ExecBuffer, *res.imageView, util::pipelineStages(binding.stage), binding.access); accessImage(DxvkCmdBuffer::ExecBuffer, *res.imageView, util::pipelineStages(binding.stage), binding.access, binding.accessOp);
m_cmd->track(res.imageView->image(), (binding.access & vk::AccessWriteMask) m_cmd->track(res.imageView->image(), (binding.access & vk::AccessWriteMask)
? DxvkAccess::Write : DxvkAccess::Read); ? DxvkAccess::Write : DxvkAccess::Read);
@ -6017,7 +6017,7 @@ namespace dxvk {
descriptorInfo.image.imageLayout = res.imageView->image()->info().layout; descriptorInfo.image.imageLayout = res.imageView->image()->info().layout;
if (BindPoint == VK_PIPELINE_BIND_POINT_COMPUTE || unlikely(res.imageView->image()->hasGfxStores())) if (BindPoint == VK_PIPELINE_BIND_POINT_COMPUTE || unlikely(res.imageView->image()->hasGfxStores()))
accessImage(DxvkCmdBuffer::ExecBuffer, *res.imageView, util::pipelineStages(binding.stage), binding.access); accessImage(DxvkCmdBuffer::ExecBuffer, *res.imageView, util::pipelineStages(binding.stage), binding.access, DxvkAccessOp::None);
m_cmd->track(res.sampler); m_cmd->track(res.sampler);
m_cmd->track(res.imageView->image(), DxvkAccess::Read); m_cmd->track(res.imageView->image(), DxvkAccess::Read);
@ -6035,7 +6035,7 @@ namespace dxvk {
descriptorInfo.texelBuffer = res.bufferView->handle(); descriptorInfo.texelBuffer = res.bufferView->handle();
if (BindPoint == VK_PIPELINE_BIND_POINT_COMPUTE || unlikely(res.bufferView->buffer()->hasGfxStores())) if (BindPoint == VK_PIPELINE_BIND_POINT_COMPUTE || unlikely(res.bufferView->buffer()->hasGfxStores()))
accessBuffer(DxvkCmdBuffer::ExecBuffer, *res.bufferView, util::pipelineStages(binding.stage), binding.access); accessBuffer(DxvkCmdBuffer::ExecBuffer, *res.bufferView, util::pipelineStages(binding.stage), binding.access, DxvkAccessOp::None);
m_cmd->track(res.bufferView->buffer(), DxvkAccess::Read); m_cmd->track(res.bufferView->buffer(), DxvkAccess::Read);
} else { } else {
@ -6050,7 +6050,7 @@ namespace dxvk {
descriptorInfo.texelBuffer = res.bufferView->handle(); descriptorInfo.texelBuffer = res.bufferView->handle();
if (BindPoint == VK_PIPELINE_BIND_POINT_COMPUTE || res.bufferView->buffer()->hasGfxStores()) if (BindPoint == VK_PIPELINE_BIND_POINT_COMPUTE || res.bufferView->buffer()->hasGfxStores())
accessBuffer(DxvkCmdBuffer::ExecBuffer, *res.bufferView, util::pipelineStages(binding.stage), binding.access); accessBuffer(DxvkCmdBuffer::ExecBuffer, *res.bufferView, util::pipelineStages(binding.stage), binding.access, binding.accessOp);
m_cmd->track(res.bufferView->buffer(), (binding.access & vk::AccessWriteMask) m_cmd->track(res.bufferView->buffer(), (binding.access & vk::AccessWriteMask)
? DxvkAccess::Write : DxvkAccess::Read); ? DxvkAccess::Write : DxvkAccess::Read);
@ -6066,7 +6066,7 @@ namespace dxvk {
descriptorInfo = res.bufferSlice.getDescriptor(); descriptorInfo = res.bufferSlice.getDescriptor();
if (BindPoint == VK_PIPELINE_BIND_POINT_COMPUTE || unlikely(res.bufferSlice.buffer()->hasGfxStores())) if (BindPoint == VK_PIPELINE_BIND_POINT_COMPUTE || unlikely(res.bufferSlice.buffer()->hasGfxStores()))
accessBuffer(DxvkCmdBuffer::ExecBuffer, res.bufferSlice, util::pipelineStages(binding.stage), binding.access); accessBuffer(DxvkCmdBuffer::ExecBuffer, res.bufferSlice, util::pipelineStages(binding.stage), binding.access, DxvkAccessOp::None);
m_cmd->track(res.bufferSlice.buffer(), DxvkAccess::Read); m_cmd->track(res.bufferSlice.buffer(), DxvkAccess::Read);
} else { } else {
@ -6083,7 +6083,7 @@ namespace dxvk {
descriptorInfo = res.bufferSlice.getDescriptor(); descriptorInfo = res.bufferSlice.getDescriptor();
if (BindPoint == VK_PIPELINE_BIND_POINT_COMPUTE || unlikely(res.bufferSlice.buffer()->hasGfxStores())) if (BindPoint == VK_PIPELINE_BIND_POINT_COMPUTE || unlikely(res.bufferSlice.buffer()->hasGfxStores()))
accessBuffer(DxvkCmdBuffer::ExecBuffer, res.bufferSlice, util::pipelineStages(binding.stage), binding.access); accessBuffer(DxvkCmdBuffer::ExecBuffer, res.bufferSlice, util::pipelineStages(binding.stage), binding.access, binding.accessOp);
m_cmd->track(res.bufferSlice.buffer(), (binding.access & vk::AccessWriteMask) m_cmd->track(res.bufferSlice.buffer(), (binding.access & vk::AccessWriteMask)
? DxvkAccess::Write : DxvkAccess::Read); ? DxvkAccess::Write : DxvkAccess::Read);
@ -6222,7 +6222,8 @@ namespace dxvk {
*attachment.view->image(), *attachment.view->image(),
attachment.view->imageSubresources(), oldLayout, attachment.view->imageSubresources(), oldLayout,
VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT,
VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT); VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT |
VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT, DxvkAccessOp::None);
m_cmd->track(attachment.view->image(), DxvkAccess::Write); m_cmd->track(attachment.view->image(), DxvkAccess::Write);
} }
@ -6233,14 +6234,17 @@ namespace dxvk {
const DxvkAttachment& attachment, const DxvkAttachment& attachment,
VkImageLayout oldLayout) { VkImageLayout oldLayout) {
if (oldLayout != attachment.view->image()->info().layout) { if (oldLayout != attachment.view->image()->info().layout) {
VkAccessFlags2 access = VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_READ_BIT;
if (oldLayout != VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL)
access |= VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
accessImage(DxvkCmdBuffer::ExecBuffer, accessImage(DxvkCmdBuffer::ExecBuffer,
*attachment.view->image(), *attachment.view->image(),
attachment.view->imageSubresources(), oldLayout, attachment.view->imageSubresources(), oldLayout,
VK_PIPELINE_STAGE_2_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_2_EARLY_FRAGMENT_TESTS_BIT |
VK_PIPELINE_STAGE_2_LATE_FRAGMENT_TESTS_BIT, VK_PIPELINE_STAGE_2_LATE_FRAGMENT_TESTS_BIT,
oldLayout != VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL access, DxvkAccessOp::None);
? VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT
: VK_ACCESS_2_NONE);
m_cmd->track(attachment.view->image(), DxvkAccess::Write); m_cmd->track(attachment.view->image(), DxvkAccess::Write);
} }
@ -6385,7 +6389,7 @@ namespace dxvk {
if (unlikely(m_state.vi.indexBuffer.buffer()->hasGfxStores())) { if (unlikely(m_state.vi.indexBuffer.buffer()->hasGfxStores())) {
accessBuffer(DxvkCmdBuffer::ExecBuffer, m_state.vi.indexBuffer, accessBuffer(DxvkCmdBuffer::ExecBuffer, m_state.vi.indexBuffer,
VK_PIPELINE_STAGE_VERTEX_INPUT_BIT, VK_ACCESS_INDEX_READ_BIT); VK_PIPELINE_STAGE_VERTEX_INPUT_BIT, VK_ACCESS_INDEX_READ_BIT, DxvkAccessOp::None);
} }
m_cmd->track(m_state.vi.indexBuffer.buffer(), DxvkAccess::Read); m_cmd->track(m_state.vi.indexBuffer.buffer(), DxvkAccess::Read);
@ -6427,7 +6431,7 @@ namespace dxvk {
if (unlikely(m_state.vi.vertexBuffers[binding].buffer()->hasGfxStores())) { if (unlikely(m_state.vi.vertexBuffers[binding].buffer()->hasGfxStores())) {
accessBuffer(DxvkCmdBuffer::ExecBuffer, m_state.vi.vertexBuffers[binding], accessBuffer(DxvkCmdBuffer::ExecBuffer, m_state.vi.vertexBuffers[binding],
VK_PIPELINE_STAGE_VERTEX_INPUT_BIT, VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT); VK_PIPELINE_STAGE_VERTEX_INPUT_BIT, VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT, DxvkAccessOp::None);
} }
m_cmd->track(m_state.vi.vertexBuffers[binding].buffer(), DxvkAccess::Read); m_cmd->track(m_state.vi.vertexBuffers[binding].buffer(), DxvkAccess::Read);
@ -6489,7 +6493,7 @@ namespace dxvk {
accessBuffer(DxvkCmdBuffer::ExecBuffer, m_state.xfb.buffers[i], accessBuffer(DxvkCmdBuffer::ExecBuffer, m_state.xfb.buffers[i],
VK_PIPELINE_STAGE_2_TRANSFORM_FEEDBACK_BIT_EXT, VK_PIPELINE_STAGE_2_TRANSFORM_FEEDBACK_BIT_EXT,
VK_ACCESS_2_TRANSFORM_FEEDBACK_WRITE_BIT_EXT); VK_ACCESS_2_TRANSFORM_FEEDBACK_WRITE_BIT_EXT, DxvkAccessOp::None);
m_cmd->track(std::move(buffer), DxvkAccess::Write); m_cmd->track(std::move(buffer), DxvkAccess::Write);
} }
@ -6814,7 +6818,7 @@ namespace dxvk {
case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: { case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: {
if (slot.bufferView) { if (slot.bufferView) {
if (!IsGraphics || slot.bufferView->buffer()->hasGfxStores()) if (!IsGraphics || slot.bufferView->buffer()->hasGfxStores())
requiresBarrier |= checkBufferViewBarrier<BindPoint>(slot.bufferView, binding.access); requiresBarrier |= checkBufferViewBarrier<BindPoint>(slot.bufferView, binding.access, binding.accessOp);
else if (binding.access & vk::AccessWriteMask) else if (binding.access & vk::AccessWriteMask)
requiresBarrier |= !slot.bufferView->buffer()->trackGfxStores(); requiresBarrier |= !slot.bufferView->buffer()->trackGfxStores();
} }
@ -6822,18 +6826,18 @@ namespace dxvk {
case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: { case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: {
if (slot.bufferView && (!IsGraphics || slot.bufferView->buffer()->hasGfxStores())) if (slot.bufferView && (!IsGraphics || slot.bufferView->buffer()->hasGfxStores()))
requiresBarrier |= checkBufferViewBarrier<BindPoint>(slot.bufferView, binding.access); requiresBarrier |= checkBufferViewBarrier<BindPoint>(slot.bufferView, binding.access, DxvkAccessOp::None);
} break; } break;
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: { case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: {
if (slot.bufferSlice.length() && (!IsGraphics || slot.bufferSlice.buffer()->hasGfxStores())) if (slot.bufferSlice.length() && (!IsGraphics || slot.bufferSlice.buffer()->hasGfxStores()))
requiresBarrier |= checkBufferBarrier<BindPoint>(slot.bufferSlice, binding.access); requiresBarrier |= checkBufferBarrier<BindPoint>(slot.bufferSlice, binding.access, DxvkAccessOp::None);
} break; } break;
case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER: { case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER: {
if (slot.bufferSlice.length()) { if (slot.bufferSlice.length()) {
if (!IsGraphics || slot.bufferSlice.buffer()->hasGfxStores()) if (!IsGraphics || slot.bufferSlice.buffer()->hasGfxStores())
requiresBarrier |= checkBufferBarrier<BindPoint>(slot.bufferSlice, binding.access); requiresBarrier |= checkBufferBarrier<BindPoint>(slot.bufferSlice, binding.access, binding.accessOp);
else if (binding.access & vk::AccessWriteMask) else if (binding.access & vk::AccessWriteMask)
requiresBarrier |= !slot.bufferSlice.buffer()->trackGfxStores(); requiresBarrier |= !slot.bufferSlice.buffer()->trackGfxStores();
} }
@ -6842,7 +6846,7 @@ namespace dxvk {
case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: { case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: {
if (slot.imageView) { if (slot.imageView) {
if (!IsGraphics || slot.imageView->image()->hasGfxStores()) if (!IsGraphics || slot.imageView->image()->hasGfxStores())
requiresBarrier |= checkImageViewBarrier<BindPoint>(slot.imageView, binding.access); requiresBarrier |= checkImageViewBarrier<BindPoint>(slot.imageView, binding.access, binding.accessOp);
else if (binding.access & vk::AccessWriteMask) else if (binding.access & vk::AccessWriteMask)
requiresBarrier |= !slot.imageView->image()->trackGfxStores(); requiresBarrier |= !slot.imageView->image()->trackGfxStores();
} }
@ -6851,7 +6855,7 @@ namespace dxvk {
case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE: case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE:
case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: { case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: {
if (slot.imageView && (!IsGraphics || slot.imageView->image()->hasGfxStores())) if (slot.imageView && (!IsGraphics || slot.imageView->image()->hasGfxStores()))
requiresBarrier |= checkImageViewBarrier<BindPoint>(slot.imageView, binding.access); requiresBarrier |= checkImageViewBarrier<BindPoint>(slot.imageView, binding.access, DxvkAccessOp::None);
} break; } break;
default: default:
@ -6904,13 +6908,14 @@ namespace dxvk {
if (xfbBufferSlice.length()) { if (xfbBufferSlice.length()) {
requiresBarrier |= !xfbBufferSlice.buffer()->trackGfxStores(); requiresBarrier |= !xfbBufferSlice.buffer()->trackGfxStores();
requiresBarrier |= checkBufferBarrier<VK_PIPELINE_BIND_POINT_GRAPHICS>( requiresBarrier |= checkBufferBarrier<VK_PIPELINE_BIND_POINT_GRAPHICS>(
xfbBufferSlice, VK_ACCESS_TRANSFORM_FEEDBACK_WRITE_BIT_EXT); xfbBufferSlice, VK_ACCESS_TRANSFORM_FEEDBACK_WRITE_BIT_EXT, DxvkAccessOp::None);
if (xfbCounterSlice.length()) { if (xfbCounterSlice.length()) {
requiresBarrier |= !xfbCounterSlice.buffer()->trackGfxStores(); requiresBarrier |= !xfbCounterSlice.buffer()->trackGfxStores();
requiresBarrier |= checkBufferBarrier<VK_PIPELINE_BIND_POINT_GRAPHICS>(xfbCounterSlice, requiresBarrier |= checkBufferBarrier<VK_PIPELINE_BIND_POINT_GRAPHICS>(xfbCounterSlice,
VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT | VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_READ_BIT_EXT |
VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT); VK_ACCESS_TRANSFORM_FEEDBACK_COUNTER_WRITE_BIT_EXT,
DxvkAccessOp::None);
} }
} }
} }
@ -6930,7 +6935,8 @@ namespace dxvk {
for (uint32_t i = 0; i < slices.size(); i++) { for (uint32_t i = 0; i < slices.size(); i++) {
if (slices[i]->length() && slices[i]->buffer()->hasGfxStores()) { if (slices[i]->length() && slices[i]->buffer()->hasGfxStores()) {
if (checkBufferBarrier<VK_PIPELINE_BIND_POINT_GRAPHICS>(*slices[i], VK_ACCESS_INDIRECT_COMMAND_READ_BIT)) if (checkBufferBarrier<VK_PIPELINE_BIND_POINT_GRAPHICS>(*slices[i],
VK_ACCESS_INDIRECT_COMMAND_READ_BIT, DxvkAccessOp::None))
return true; return true;
} }
} }
@ -6942,7 +6948,8 @@ namespace dxvk {
const auto& indexBufferSlice = m_state.vi.indexBuffer; const auto& indexBufferSlice = m_state.vi.indexBuffer;
if (indexBufferSlice.length() && indexBufferSlice.buffer()->hasGfxStores()) { if (indexBufferSlice.length() && indexBufferSlice.buffer()->hasGfxStores()) {
if (checkBufferBarrier<VK_PIPELINE_BIND_POINT_GRAPHICS>(indexBufferSlice, VK_ACCESS_INDEX_READ_BIT)) if (checkBufferBarrier<VK_PIPELINE_BIND_POINT_GRAPHICS>(indexBufferSlice,
VK_ACCESS_INDEX_READ_BIT, DxvkAccessOp::None))
return true; return true;
} }
} }
@ -6956,7 +6963,8 @@ namespace dxvk {
const auto& vertexBufferSlice = m_state.vi.vertexBuffers[binding]; const auto& vertexBufferSlice = m_state.vi.vertexBuffers[binding];
if (vertexBufferSlice.length() && vertexBufferSlice.buffer()->hasGfxStores()) { if (vertexBufferSlice.length() && vertexBufferSlice.buffer()->hasGfxStores()) {
if (checkBufferBarrier<VK_PIPELINE_BIND_POINT_GRAPHICS>(vertexBufferSlice, VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT)) if (checkBufferBarrier<VK_PIPELINE_BIND_POINT_GRAPHICS>(vertexBufferSlice,
VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT, DxvkAccessOp::None))
return true; return true;
} }
} }
@ -6969,10 +6977,11 @@ namespace dxvk {
template<VkPipelineBindPoint BindPoint> template<VkPipelineBindPoint BindPoint>
bool DxvkContext::checkBufferBarrier( bool DxvkContext::checkBufferBarrier(
const DxvkBufferSlice& bufferSlice, const DxvkBufferSlice& bufferSlice,
VkAccessFlags access) { VkAccessFlags access,
return checkResourceBarrier<BindPoint>([this, &bufferSlice] (DxvkAccess access) { DxvkAccessOp accessOp) {
return checkResourceBarrier<BindPoint>([this, &bufferSlice, accessOp] (DxvkAccess access) {
return resourceHasAccess(*bufferSlice.buffer(), return resourceHasAccess(*bufferSlice.buffer(),
bufferSlice.offset(), bufferSlice.length(), access); bufferSlice.offset(), bufferSlice.length(), access, accessOp);
}, access); }, access);
} }
@ -6980,9 +6989,10 @@ namespace dxvk {
template<VkPipelineBindPoint BindPoint> template<VkPipelineBindPoint BindPoint>
bool DxvkContext::checkBufferViewBarrier( bool DxvkContext::checkBufferViewBarrier(
const Rc<DxvkBufferView>& bufferView, const Rc<DxvkBufferView>& bufferView,
VkAccessFlags access) { VkAccessFlags access,
return checkResourceBarrier<BindPoint>([this, &bufferView] (DxvkAccess access) { DxvkAccessOp accessOp) {
return resourceHasAccess(*bufferView, access); return checkResourceBarrier<BindPoint>([this, &bufferView, accessOp] (DxvkAccess access) {
return resourceHasAccess(*bufferView, access, accessOp);
}, access); }, access);
} }
@ -6990,9 +7000,10 @@ namespace dxvk {
template<VkPipelineBindPoint BindPoint> template<VkPipelineBindPoint BindPoint>
bool DxvkContext::checkImageViewBarrier( bool DxvkContext::checkImageViewBarrier(
const Rc<DxvkImageView>& imageView, const Rc<DxvkImageView>& imageView,
VkAccessFlags access) { VkAccessFlags access,
return checkResourceBarrier<BindPoint>([this, &imageView] (DxvkAccess access) { DxvkAccessOp accessOp) {
return resourceHasAccess(*imageView, access); return checkResourceBarrier<BindPoint>([this, &imageView, accessOp] (DxvkAccess access) {
return resourceHasAccess(*imageView, access, accessOp);
}, access); }, access);
} }
@ -7717,12 +7728,14 @@ namespace dxvk {
const VkImageSubresourceRange& subresources, const VkImageSubresourceRange& subresources,
VkImageLayout srcLayout, VkImageLayout srcLayout,
VkPipelineStageFlags2 srcStages, VkPipelineStageFlags2 srcStages,
VkAccessFlags2 srcAccess) { VkAccessFlags2 srcAccess,
DxvkAccessOp accessOp) {
accessImage(cmdBuffer, image, subresources, accessImage(cmdBuffer, image, subresources,
srcLayout, srcStages, srcAccess, srcLayout, srcStages, srcAccess,
image.info().layout, image.info().layout,
image.info().stages, image.info().stages,
image.info().access); image.info().access,
accessOp);
} }
@ -7730,11 +7743,12 @@ namespace dxvk {
DxvkCmdBuffer cmdBuffer, DxvkCmdBuffer cmdBuffer,
const DxvkImageView& imageView, const DxvkImageView& imageView,
VkPipelineStageFlags2 srcStages, VkPipelineStageFlags2 srcStages,
VkAccessFlags2 srcAccess) { VkAccessFlags2 srcAccess,
DxvkAccessOp accessOp) {
accessImage(cmdBuffer, *imageView.image(), accessImage(cmdBuffer, *imageView.image(),
imageView.imageSubresources(), imageView.imageSubresources(),
imageView.image()->info().layout, imageView.image()->info().layout,
srcStages, srcAccess); srcStages, srcAccess, accessOp);
} }
@ -7747,7 +7761,8 @@ namespace dxvk {
VkAccessFlags2 srcAccess, VkAccessFlags2 srcAccess,
VkImageLayout dstLayout, VkImageLayout dstLayout,
VkPipelineStageFlags2 dstStages, VkPipelineStageFlags2 dstStages,
VkAccessFlags2 dstAccess) { VkAccessFlags2 dstAccess,
DxvkAccessOp accessOp) {
auto& batch = getBarrierBatch(cmdBuffer); auto& batch = getBarrierBatch(cmdBuffer);
if (srcLayout == VK_IMAGE_LAYOUT_UNDEFINED || srcLayout == VK_IMAGE_LAYOUT_PREINITIALIZED) if (srcLayout == VK_IMAGE_LAYOUT_UNDEFINED || srcLayout == VK_IMAGE_LAYOUT_PREINITIALIZED)
@ -7808,11 +7823,13 @@ namespace dxvk {
VkDeviceSize offset, VkDeviceSize offset,
VkDeviceSize size, VkDeviceSize size,
VkPipelineStageFlags2 srcStages, VkPipelineStageFlags2 srcStages,
VkAccessFlags2 srcAccess) { VkAccessFlags2 srcAccess,
DxvkAccessOp accessOp) {
accessBuffer(cmdBuffer, buffer, offset, size, accessBuffer(cmdBuffer, buffer, offset, size,
srcStages, srcAccess, srcStages, srcAccess,
buffer.info().stages, buffer.info().stages,
buffer.info().access); buffer.info().access,
accessOp);
} }
@ -7824,7 +7841,8 @@ namespace dxvk {
VkPipelineStageFlags2 srcStages, VkPipelineStageFlags2 srcStages,
VkAccessFlags2 srcAccess, VkAccessFlags2 srcAccess,
VkPipelineStageFlags2 dstStages, VkPipelineStageFlags2 dstStages,
VkAccessFlags2 dstAccess) { VkAccessFlags2 dstAccess,
DxvkAccessOp accessOp) {
if (unlikely(!size)) if (unlikely(!size))
return; return;
@ -7856,12 +7874,14 @@ namespace dxvk {
DxvkCmdBuffer cmdBuffer, DxvkCmdBuffer cmdBuffer,
const DxvkBufferSlice& bufferSlice, const DxvkBufferSlice& bufferSlice,
VkPipelineStageFlags2 srcStages, VkPipelineStageFlags2 srcStages,
VkAccessFlags2 srcAccess) { VkAccessFlags2 srcAccess,
DxvkAccessOp accessOp) {
accessBuffer(cmdBuffer, accessBuffer(cmdBuffer,
*bufferSlice.buffer(), *bufferSlice.buffer(),
bufferSlice.offset(), bufferSlice.offset(),
bufferSlice.length(), bufferSlice.length(),
srcStages, srcAccess); srcStages, srcAccess,
accessOp);
} }
@ -7871,13 +7891,15 @@ namespace dxvk {
VkPipelineStageFlags2 srcStages, VkPipelineStageFlags2 srcStages,
VkAccessFlags2 srcAccess, VkAccessFlags2 srcAccess,
VkPipelineStageFlags2 dstStages, VkPipelineStageFlags2 dstStages,
VkAccessFlags2 dstAccess) { VkAccessFlags2 dstAccess,
DxvkAccessOp accessOp) {
accessBuffer(cmdBuffer, accessBuffer(cmdBuffer,
*bufferSlice.buffer(), *bufferSlice.buffer(),
bufferSlice.offset(), bufferSlice.offset(),
bufferSlice.length(), bufferSlice.length(),
srcStages, srcAccess, srcStages, srcAccess,
dstStages, dstAccess); dstStages, dstAccess,
accessOp);
} }
@ -7885,12 +7907,13 @@ namespace dxvk {
DxvkCmdBuffer cmdBuffer, DxvkCmdBuffer cmdBuffer,
DxvkBufferView& bufferView, DxvkBufferView& bufferView,
VkPipelineStageFlags2 srcStages, VkPipelineStageFlags2 srcStages,
VkAccessFlags2 srcAccess) { VkAccessFlags2 srcAccess,
DxvkAccessOp accessOp) {
accessBuffer(cmdBuffer, accessBuffer(cmdBuffer,
*bufferView.buffer(), *bufferView.buffer(),
bufferView.info().offset, bufferView.info().offset,
bufferView.info().size, bufferView.info().size,
srcStages, srcAccess); srcStages, srcAccess, accessOp);
} }
@ -7900,13 +7923,15 @@ namespace dxvk {
VkPipelineStageFlags2 srcStages, VkPipelineStageFlags2 srcStages,
VkAccessFlags2 srcAccess, VkAccessFlags2 srcAccess,
VkPipelineStageFlags2 dstStages, VkPipelineStageFlags2 dstStages,
VkAccessFlags2 dstAccess) { VkAccessFlags2 dstAccess,
DxvkAccessOp accessOp) {
accessBuffer(cmdBuffer, accessBuffer(cmdBuffer,
*bufferView.buffer(), *bufferView.buffer(),
bufferView.info().offset, bufferView.info().offset,
bufferView.info().size, bufferView.info().size,
srcStages, srcAccess, srcStages, srcAccess,
dstStages, dstAccess); dstStages, dstAccess,
accessOp);
} }
@ -7921,7 +7946,8 @@ namespace dxvk {
*m_state.id.argBuffer.buffer(), *m_state.id.argBuffer.buffer(),
m_state.id.argBuffer.offset() + offset, dataSize, m_state.id.argBuffer.offset() + offset, dataSize,
VK_PIPELINE_STAGE_2_DRAW_INDIRECT_BIT, VK_PIPELINE_STAGE_2_DRAW_INDIRECT_BIT,
VK_ACCESS_2_INDIRECT_COMMAND_READ_BIT_KHR); VK_ACCESS_2_INDIRECT_COMMAND_READ_BIT_KHR,
DxvkAccessOp::None);
} }
@ -7931,7 +7957,8 @@ namespace dxvk {
*m_state.id.cntBuffer.buffer(), *m_state.id.cntBuffer.buffer(),
m_state.id.cntBuffer.offset() + offset, sizeof(uint32_t), m_state.id.cntBuffer.offset() + offset, sizeof(uint32_t),
VK_PIPELINE_STAGE_2_DRAW_INDIRECT_BIT, VK_PIPELINE_STAGE_2_DRAW_INDIRECT_BIT,
VK_ACCESS_2_INDIRECT_COMMAND_READ_BIT_KHR); VK_ACCESS_2_INDIRECT_COMMAND_READ_BIT_KHR,
DxvkAccessOp::None);
} }
@ -7940,10 +7967,13 @@ namespace dxvk {
VkDeviceSize offset, VkDeviceSize offset,
VkDeviceSize size, VkDeviceSize size,
DxvkAccess access) { DxvkAccess access) {
bool flush = resourceHasAccess(buffer, offset, size, DxvkAccess::Write); bool flush = resourceHasAccess(buffer, offset, size,
DxvkAccess::Write, DxvkAccessOp::None);
if (access == DxvkAccess::Write && !flush) if (access == DxvkAccess::Write && !flush) {
flush = resourceHasAccess(buffer, offset, size, DxvkAccess::Read); flush = resourceHasAccess(buffer, offset, size,
DxvkAccess::Read, DxvkAccessOp::None);
}
if (flush) if (flush)
flushBarriers(); flushBarriers();
@ -7964,10 +7994,13 @@ namespace dxvk {
DxvkImage& image, DxvkImage& image,
const VkImageSubresourceRange& subresources, const VkImageSubresourceRange& subresources,
DxvkAccess access) { DxvkAccess access) {
bool flush = resourceHasAccess(image, subresources, DxvkAccess::Write); bool flush = resourceHasAccess(image, subresources,
DxvkAccess::Write, DxvkAccessOp::None);
if (access == DxvkAccess::Write && !flush) if (access == DxvkAccess::Write && !flush) {
flush = resourceHasAccess(image, subresources, DxvkAccess::Read); flush = resourceHasAccess(image, subresources,
DxvkAccess::Read, DxvkAccessOp::None);
}
if (flush) if (flush)
flushBarriers(); flushBarriers();
@ -7994,7 +8027,8 @@ namespace dxvk {
DxvkBuffer& buffer, DxvkBuffer& buffer,
VkDeviceSize offset, VkDeviceSize offset,
VkDeviceSize size, VkDeviceSize size,
DxvkAccess access) { DxvkAccess access,
DxvkAccessOp accessOp) {
if (unlikely(!size)) if (unlikely(!size))
return false; return false;
@ -8009,17 +8043,19 @@ namespace dxvk {
bool DxvkContext::resourceHasAccess( bool DxvkContext::resourceHasAccess(
DxvkBufferView& bufferView, DxvkBufferView& bufferView,
DxvkAccess access) { DxvkAccess access,
DxvkAccessOp accessOp) {
return resourceHasAccess(*bufferView.buffer(), return resourceHasAccess(*bufferView.buffer(),
bufferView.info().offset, bufferView.info().offset,
bufferView.info().size, access); bufferView.info().size, access, accessOp);
} }
bool DxvkContext::resourceHasAccess( bool DxvkContext::resourceHasAccess(
DxvkImage& image, DxvkImage& image,
const VkImageSubresourceRange& subresources, const VkImageSubresourceRange& subresources,
DxvkAccess access) { DxvkAccess access,
DxvkAccessOp accessOp) {
uint32_t layerCount = image.info().numLayers; uint32_t layerCount = image.info().numLayers;
// Subresources are enumerated in such a way that array layers of // Subresources are enumerated in such a way that array layers of
@ -8053,8 +8089,9 @@ namespace dxvk {
bool DxvkContext::resourceHasAccess( bool DxvkContext::resourceHasAccess(
DxvkImageView& imageView, DxvkImageView& imageView,
DxvkAccess access) { DxvkAccess access,
return resourceHasAccess(*imageView.image(), imageView.imageSubresources(), access); DxvkAccessOp accessOp) {
return resourceHasAccess(*imageView.image(), imageView.imageSubresources(), access, accessOp);
} }

48
src/dxvk/dxvk_context.h
View file

@ -1771,17 +1771,20 @@ namespace dxvk {
template<VkPipelineBindPoint BindPoint> template<VkPipelineBindPoint BindPoint>
bool checkBufferBarrier( bool checkBufferBarrier(
const DxvkBufferSlice& bufferSlice, const DxvkBufferSlice& bufferSlice,
VkAccessFlags access); VkAccessFlags access,
DxvkAccessOp accessOp);
template<VkPipelineBindPoint BindPoint> template<VkPipelineBindPoint BindPoint>
bool checkBufferViewBarrier( bool checkBufferViewBarrier(
const Rc<DxvkBufferView>& bufferView, const Rc<DxvkBufferView>& bufferView,
VkAccessFlags access); VkAccessFlags access,
DxvkAccessOp accessOp);
template<VkPipelineBindPoint BindPoint> template<VkPipelineBindPoint BindPoint>
bool checkImageViewBarrier( bool checkImageViewBarrier(
const Rc<DxvkImageView>& imageView, const Rc<DxvkImageView>& imageView,
VkAccessFlags access); VkAccessFlags access,
DxvkAccessOp accessOp);
template<VkPipelineBindPoint BindPoint> template<VkPipelineBindPoint BindPoint>
DxvkAccessFlags getAllowedStorageHazards() { DxvkAccessFlags getAllowedStorageHazards() {
@ -1901,13 +1904,15 @@ namespace dxvk {
const VkImageSubresourceRange& subresources, const VkImageSubresourceRange& subresources,
VkImageLayout srcLayout, VkImageLayout srcLayout,
VkPipelineStageFlags2 srcStages, VkPipelineStageFlags2 srcStages,
VkAccessFlags2 srcAccess); VkAccessFlags2 srcAccess,
DxvkAccessOp accessOp);
void accessImage( void accessImage(
DxvkCmdBuffer cmdBuffer, DxvkCmdBuffer cmdBuffer,
const DxvkImageView& imageView, const DxvkImageView& imageView,
VkPipelineStageFlags2 srcStages, VkPipelineStageFlags2 srcStages,
VkAccessFlags2 srcAccess); VkAccessFlags2 srcAccess,
DxvkAccessOp accessOp);
void accessImage( void accessImage(
DxvkCmdBuffer cmdBuffer, DxvkCmdBuffer cmdBuffer,
@ -1918,7 +1923,8 @@ namespace dxvk {
VkAccessFlags2 srcAccess, VkAccessFlags2 srcAccess,
VkImageLayout dstLayout, VkImageLayout dstLayout,
VkPipelineStageFlags2 dstStages, VkPipelineStageFlags2 dstStages,
VkAccessFlags2 dstAccess); VkAccessFlags2 dstAccess,
DxvkAccessOp accessOp);
void accessBuffer( void accessBuffer(
DxvkCmdBuffer cmdBuffer, DxvkCmdBuffer cmdBuffer,
@ -1926,7 +1932,8 @@ namespace dxvk {
VkDeviceSize offset, VkDeviceSize offset,
VkDeviceSize size, VkDeviceSize size,
VkPipelineStageFlags2 srcStages, VkPipelineStageFlags2 srcStages,
VkAccessFlags2 srcAccess); VkAccessFlags2 srcAccess,
DxvkAccessOp accessOp);
void accessBuffer( void accessBuffer(
DxvkCmdBuffer cmdBuffer, DxvkCmdBuffer cmdBuffer,
@ -1936,13 +1943,15 @@ namespace dxvk {
VkPipelineStageFlags2 srcStages, VkPipelineStageFlags2 srcStages,
VkAccessFlags2 srcAccess, VkAccessFlags2 srcAccess,
VkPipelineStageFlags2 dstStages, VkPipelineStageFlags2 dstStages,
VkAccessFlags2 dstAccess); VkAccessFlags2 dstAccess,
DxvkAccessOp accessOp);
void accessBuffer( void accessBuffer(
DxvkCmdBuffer cmdBuffer, DxvkCmdBuffer cmdBuffer,
const DxvkBufferSlice& bufferSlice, const DxvkBufferSlice& bufferSlice,
VkPipelineStageFlags2 srcStages, VkPipelineStageFlags2 srcStages,
VkAccessFlags2 srcAccess); VkAccessFlags2 srcAccess,
DxvkAccessOp accessOp);
void accessBuffer( void accessBuffer(
DxvkCmdBuffer cmdBuffer, DxvkCmdBuffer cmdBuffer,
@ -1950,13 +1959,15 @@ namespace dxvk {
VkPipelineStageFlags2 srcStages, VkPipelineStageFlags2 srcStages,
VkAccessFlags2 srcAccess, VkAccessFlags2 srcAccess,
VkPipelineStageFlags2 dstStages, VkPipelineStageFlags2 dstStages,
VkAccessFlags2 dstAccess); VkAccessFlags2 dstAccess,
DxvkAccessOp accessOp);
void accessBuffer( void accessBuffer(
DxvkCmdBuffer cmdBuffer, DxvkCmdBuffer cmdBuffer,
DxvkBufferView& bufferView, DxvkBufferView& bufferView,
VkPipelineStageFlags2 srcStages, VkPipelineStageFlags2 srcStages,
VkAccessFlags2 srcAccess); VkAccessFlags2 srcAccess,
DxvkAccessOp accessOp);
void accessBuffer( void accessBuffer(
DxvkCmdBuffer cmdBuffer, DxvkCmdBuffer cmdBuffer,
@ -1964,7 +1975,8 @@ namespace dxvk {
VkPipelineStageFlags2 srcStages, VkPipelineStageFlags2 srcStages,
VkAccessFlags2 srcAccess, VkAccessFlags2 srcAccess,
VkPipelineStageFlags2 dstStages, VkPipelineStageFlags2 dstStages,
VkAccessFlags2 dstAccess); VkAccessFlags2 dstAccess,
DxvkAccessOp accessOp);
void accessDrawBuffer( void accessDrawBuffer(
VkDeviceSize offset, VkDeviceSize offset,
@ -2000,20 +2012,24 @@ namespace dxvk {
DxvkBuffer& buffer, DxvkBuffer& buffer,
VkDeviceSize offset, VkDeviceSize offset,
VkDeviceSize size, VkDeviceSize size,
DxvkAccess access); DxvkAccess access,
DxvkAccessOp accessOp);
bool resourceHasAccess( bool resourceHasAccess(
DxvkBufferView& bufferView, DxvkBufferView& bufferView,
DxvkAccess access); DxvkAccess access,
DxvkAccessOp accessOp);
bool resourceHasAccess( bool resourceHasAccess(
DxvkImage& image, DxvkImage& image,
const VkImageSubresourceRange& subresources, const VkImageSubresourceRange& subresources,
DxvkAccess access); DxvkAccess access,
DxvkAccessOp accessOp);
bool resourceHasAccess( bool resourceHasAccess(
DxvkImageView& imageView, DxvkImageView& imageView,
DxvkAccess access); DxvkAccess access,
DxvkAccessOp accessOp);
DxvkBarrierBatch& getBarrierBatch( DxvkBarrierBatch& getBarrierBatch(
DxvkCmdBuffer cmdBuffer); DxvkCmdBuffer cmdBuffer);