rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-02-23 19:54:16 +01:00
Code Issues Projects Releases Wiki Activity

[dxvk] Rework compute barrier tracking

Browse Source
This commit is contained in:
Philip Rebohle 2025-02-14 21:42:30 +01:00
parent e45ea9f3bb
commit 8f77fc9371
2 changed files with 19 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/dxvk/dxvk_context.cpp
View File

@ -6610,7 +6610,13 @@ namespace dxvk {
return false;
}
this->commitComputeBarriers<false>();
if (this->checkComputeHazards()) {
this->flushBarriers();
// Dirty descriptors if this hasn't happened yet for
// whatever reason in order to re-emit barriers
m_descriptorState.dirtyStages(VK_SHADER_STAGE_COMPUTE_BIT);
}
if (m_descriptorState.hasDirtyComputeSets())
this->updateComputeShaderResources();
@ -6705,63 +6711,6 @@ namespace dxvk {
}
template<bool DoEmit>
void DxvkContext::commitComputeBarriers() {
const auto& layout = m_state.cp.pipeline->getBindings()->layout();
// Exit early if we're only checking for hazards and
// if the barrier set is empty, to avoid some overhead.
if (!DoEmit && m_barrierTracker.empty())
return;
for (uint32_t i = 0; i < DxvkDescriptorSets::CsSetCount; i++) {
uint32_t bindingCount = layout.getBindingCount(i);
for (uint32_t j = 0; j < bindingCount; j++) {
const DxvkBindingInfo& binding = layout.getBinding(i, j);
const DxvkShaderResourceSlot& slot = m_rc[binding.resourceBinding];
bool requiresBarrier = false;
switch (binding.descriptorType) {
case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER:
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER:
if (likely(slot.bufferSlice.length())) {
requiresBarrier = this->checkBufferBarrier<DoEmit>(slot.bufferSlice,
VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, binding.access);
}
break;
case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER:
case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER:
if (likely(slot.bufferView != nullptr)) {
requiresBarrier = this->checkBufferViewBarrier<DoEmit>(slot.bufferView,
VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, binding.access);
}
break;
case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE:
case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE:
case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER:
if (likely(slot.imageView != nullptr)) {
requiresBarrier = this->checkImageViewBarrier<DoEmit>(slot.imageView,
VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, binding.access);
}
break;
default:
/* nothing to do */;
}
if (requiresBarrier) {
flushBarriers();
return;
}
}
}
}
template<VkPipelineBindPoint BindPoint>
bool DxvkContext::checkResourceHazards(
const DxvkBindingLayout& layout,
@ -6842,6 +6791,17 @@ namespace dxvk {
}
bool DxvkContext::checkComputeHazards() {
// Exit early if we know that there cannot be any hazards to avoid
// some overhead after barriers are flushed. This is common.
if (m_barrierTracker.empty())
return false;
const auto& layout = m_state.cp.pipeline->getBindings()->layout();
return checkResourceHazards<VK_PIPELINE_BIND_POINT_COMPUTE>(layout, layout.getSetMask());
}
template<bool Indexed, bool Indirect>
bool DxvkContext::checkGraphicsHazards() {
if (m_barrierControl.test(DxvkBarrierControl::IgnoreGraphicsBarriers))

3
src/dxvk/dxvk_context.h
View File

@ -1762,8 +1762,7 @@ namespace dxvk {
const DxvkBindingLayout& layout,
uint32_t setMask);
template<bool DoEmit>
void commitComputeBarriers();
bool checkComputeHazards();
template<bool Indexed, bool Indirect>
bool checkGraphicsHazards();