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

[dxvk] Use new barrier tracking for buffers

Browse Source
This commit is contained in:
Philip Rebohle 2021-09-27 18:38:02 +02:00
parent 195b7d7155
commit 30bc137f9c
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 12 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/dxvk/dxvk_barrier.cpp
View File

@ -44,7 +44,8 @@ namespace dxvk {
m_srcAccess |= srcAccess;
m_dstAccess |= dstAccess;
this->insertBufferSlice({ bufSlice, access });
m_bufSlices.insert(bufSlice.handle,
DxvkBarrierBufferSlice(bufSlice.offset, bufSlice.length, access));
}
@ -121,8 +122,10 @@ namespace dxvk {
acquire.m_bufBarriers.push_back(barrier);
DxvkAccessFlags access(DxvkAccess::Read, DxvkAccess::Write);
release.m_bufSlices.push_back({ bufSlice, access });
acquire.m_bufSlices.push_back({ bufSlice, access });
release.m_bufSlices.insert(bufSlice.handle,
DxvkBarrierBufferSlice(bufSlice.offset, bufSlice.length, access));
acquire.m_bufSlices.insert(bufSlice.handle,
DxvkBarrierBufferSlice(bufSlice.offset, bufSlice.length, access));
}
@ -173,17 +176,8 @@ namespace dxvk {
bool DxvkBarrierSet::isBufferDirty(
const DxvkBufferSliceHandle& bufSlice,
DxvkAccessFlags bufAccess) {
bool result = false;
for (uint32_t i = 0; i < m_bufSlices.size() && !result; i++) {
const DxvkBufferSliceHandle& dstSlice = m_bufSlices[i].slice;
result = (bufSlice.handle == dstSlice.handle) && (bufAccess | m_bufSlices[i].access).test(DxvkAccess::Write)
&& (bufSlice.offset + bufSlice.length > dstSlice.offset)
&& (bufSlice.offset < dstSlice.offset + dstSlice.length);
}
return result;
return m_bufSlices.isDirty(bufSlice.handle,
DxvkBarrierBufferSlice(bufSlice.offset, bufSlice.length, bufAccess));
}
@ -209,18 +203,8 @@ namespace dxvk {
DxvkAccessFlags DxvkBarrierSet::getBufferAccess(
const DxvkBufferSliceHandle& bufSlice) {
DxvkAccessFlags access;
for (uint32_t i = 0; i < m_bufSlices.size(); i++) {
const DxvkBufferSliceHandle& dstSlice = m_bufSlices[i].slice;
if ((bufSlice.handle == dstSlice.handle)
&& (bufSlice.offset + bufSlice.length > dstSlice.offset)
&& (bufSlice.offset < dstSlice.offset + dstSlice.length))
access = access | m_bufSlices[i].access;
}
return access;
return m_bufSlices.getAccess(bufSlice.handle,
DxvkBarrierBufferSlice(bufSlice.offset, bufSlice.length, 0));
}
@ -285,27 +269,11 @@ namespace dxvk {
m_bufBarriers.resize(0);
m_imgBarriers.resize(0);
m_bufSlices.resize(0);
m_bufSlices.clear();
m_imgSlices.resize(0);
}
void DxvkBarrierSet::insertBufferSlice(BufSlice slice) {
for (auto i = m_bufSlices.begin(); i != m_bufSlices.end(); i++) {
// We could try to merge adjacent ranges, but for now,
// just make sure we don't have duplicate slices.
if (slice.slice.handle == i->slice.handle
&& slice.slice.offset == i->slice.offset
&& slice.slice.length == i->slice.length) {
i->access.set(slice.access);
return;
}
}
m_bufSlices.push_back(slice);
}
void DxvkBarrierSet::insertImageSlice(ImgSlice slice) {
for (auto i = m_imgSlices.begin(); i != m_imgSlices.end(); i++) {
if (slice.image == i->image && slice.subres == i->subres) {

3
src/dxvk/dxvk_barrier.h
View File

@ -564,10 +564,9 @@ namespace dxvk {
std::vector<VkBufferMemoryBarrier> m_bufBarriers;
std::vector<VkImageMemoryBarrier> m_imgBarriers;
std::vector<BufSlice> m_bufSlices;
std::vector<ImgSlice> m_imgSlices;
void insertBufferSlice(BufSlice slice);
DxvkBarrierSubresourceSet<VkBuffer, DxvkBarrierBufferSlice> m_bufSlices;
void insertImageSlice(ImgSlice slice);