backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[dxvk] Don't rely on binding mask in commitGraphicsBarriers

Browse Source 
We can't actually use that here since we check barriers before
updating shader resources, unlike on the compute path. Check
all resources manually instead.
This commit is contained in:
Philip Rebohle 2019-10-13 02:19:48 +02:00
parent 0e578adcf5
commit 950ea21b83
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 73 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
src/dxvk/dxvk_context.cpp
View File

@ -4366,89 +4366,90 @@ namespace dxvk {
bool requiresBarrier = false; bool requiresBarrier = false;
for (uint32_t i = 0; i < layout->bindingCount() && !requiresBarrier; i++) { for (uint32_t i = 0; i < layout->bindingCount() && !requiresBarrier; i++) {
if (m_state.gp.state.bsBindingMask.test(i)) { const DxvkDescriptorSlot binding = layout->binding(i);
const DxvkDescriptorSlot binding = layout->binding(i); const DxvkShaderResourceSlot& slot = m_rc[binding.slot];
const DxvkShaderResourceSlot& slot = m_rc[binding.slot];
DxvkAccessFlags dstAccess = DxvkAccess::Read; DxvkAccessFlags dstAccess = DxvkAccess::Read;
DxvkAccessFlags srcAccess = 0; DxvkAccessFlags srcAccess = 0;
switch (binding.type) { switch (binding.type) {
case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER: case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER:
if (binding.access & VK_ACCESS_SHADER_WRITE_BIT) if (binding.access & VK_ACCESS_SHADER_WRITE_BIT)
dstAccess.set(DxvkAccess::Write); dstAccess.set(DxvkAccess::Write);
/* fall through */ /* fall through */
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER:
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC: case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC:
if (slot.bufferSlice.bufferInfo().usage & VK_BUFFER_USAGE_STORAGE_BUFFER_BIT) { if (slot.bufferSlice.defined()
srcAccess = m_gfxBarriers.getBufferAccess( && slot.bufferSlice.bufferInfo().usage & VK_BUFFER_USAGE_STORAGE_BUFFER_BIT) {
slot.bufferSlice.getSliceHandle()); srcAccess = m_gfxBarriers.getBufferAccess(
slot.bufferSlice.getSliceHandle());
m_gfxBarriers.accessBuffer( m_gfxBarriers.accessBuffer(
slot.bufferSlice.getSliceHandle(), slot.bufferSlice.getSliceHandle(),
binding.stages, binding.access, binding.stages, binding.access,
slot.bufferSlice.bufferInfo().stages, slot.bufferSlice.bufferInfo().stages,
slot.bufferSlice.bufferInfo().access); slot.bufferSlice.bufferInfo().access);
} }
break; break;
case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER:
if (binding.access & VK_ACCESS_SHADER_WRITE_BIT) if (binding.access & VK_ACCESS_SHADER_WRITE_BIT)
dstAccess.set(DxvkAccess::Write); dstAccess.set(DxvkAccess::Write);
/* fall through */ /* fall through */
case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER:
if (slot.bufferView->bufferInfo().usage & VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT) { if (slot.bufferView != nullptr
srcAccess = m_gfxBarriers.getBufferAccess( && slot.bufferView->bufferInfo().usage & VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT) {
slot.bufferView->getSliceHandle()); srcAccess = m_gfxBarriers.getBufferAccess(
slot.bufferView->getSliceHandle());
m_gfxBarriers.accessBuffer( m_gfxBarriers.accessBuffer(
slot.bufferView->getSliceHandle(), slot.bufferView->getSliceHandle(),
binding.stages, binding.access, binding.stages, binding.access,
slot.bufferView->bufferInfo().stages, slot.bufferView->bufferInfo().stages,
slot.bufferView->bufferInfo().access); slot.bufferView->bufferInfo().access);
} }
break; break;
case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE:
if (binding.access & VK_ACCESS_SHADER_WRITE_BIT) if (binding.access & VK_ACCESS_SHADER_WRITE_BIT)
dstAccess.set(DxvkAccess::Write); dstAccess.set(DxvkAccess::Write);
/* fall through */ /* fall through */
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->imageInfo().usage & VK_IMAGE_USAGE_STORAGE_BIT) { if (slot.imageView != nullptr
srcAccess = m_gfxBarriers.getImageAccess( && slot.imageView->imageInfo().usage & VK_IMAGE_USAGE_STORAGE_BIT) {
slot.imageView->image(), srcAccess = m_gfxBarriers.getImageAccess(
slot.imageView->imageSubresources()); slot.imageView->image(),
slot.imageView->imageSubresources());
m_gfxBarriers.accessImage( m_gfxBarriers.accessImage(
slot.imageView->image(), slot.imageView->image(),
slot.imageView->imageSubresources(), slot.imageView->imageSubresources(),
slot.imageView->imageInfo().layout, slot.imageView->imageInfo().layout,
binding.stages, binding.access, binding.stages, binding.access,
slot.imageView->imageInfo().layout, slot.imageView->imageInfo().layout,
slot.imageView->imageInfo().stages, slot.imageView->imageInfo().stages,
slot.imageView->imageInfo().access); slot.imageView->imageInfo().access);
} }
break; break;
default: default:
/* nothing to do */; /* nothing to do */;
}
if (srcAccess == 0)
continue;
// Skip write-after-write barriers if explicitly requested
if ((m_barrierControl.test(DxvkBarrierControl::IgnoreWriteAfterWrite))
&& (srcAccess.test(DxvkAccess::Write))
&& (dstAccess.test(DxvkAccess::Write)))
continue;
requiresBarrier = (srcAccess | dstAccess).test(DxvkAccess::Write);
} }
if (srcAccess == 0)
continue;
// Skip write-after-write barriers if explicitly requested
if ((m_barrierControl.test(DxvkBarrierControl::IgnoreWriteAfterWrite))
&& (srcAccess.test(DxvkAccess::Write))
&& (dstAccess.test(DxvkAccess::Write)))
continue;
requiresBarrier = (srcAccess | dstAccess).test(DxvkAccess::Write);
} }
// External subpass dependencies serve as full memory // External subpass dependencies serve as full memory