ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Vulkan/StreamBuffer: Prevent skipping fance when wrapping around

This commit is contained in:
Connor McLaughlin 2021-03-10 01:08:08 +10:00
parent 36ff345e60
commit ebfbae8dd1
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/vulkan/stream_buffer.cpp
View File

@ -173,8 +173,9 @@ bool StreamBuffer::ReserveMemory(u32 num_bytes, u32 alignment)
return false; return false;
} }
UpdateGPUPosition();
// Is the GPU behind or up to date with our current offset? // Is the GPU behind or up to date with our current offset?
UpdateCurrentFencePosition();
if (m_current_offset >= m_current_gpu_position) if (m_current_offset >= m_current_gpu_position)
{ {
const u32 remaining_bytes = m_size - m_current_offset; const u32 remaining_bytes = m_size - m_current_offset;
@ -194,7 +195,7 @@ bool StreamBuffer::ReserveMemory(u32 num_bytes, u32 alignment)
{ {
// Reset offset to zero, since we're allocating behind the gpu now // Reset offset to zero, since we're allocating behind the gpu now
m_current_offset = 0; m_current_offset = 0;
m_current_space = m_current_gpu_position; m_current_space = m_current_gpu_position - 1;
return true; return true;
} }
} }
@ -208,7 +209,7 @@ bool StreamBuffer::ReserveMemory(u32 num_bytes, u32 alignment)
{ {
// Place at the current position, since this is still behind the GPU. // Place at the current position, since this is still behind the GPU.
m_current_offset = Common::AlignUp(m_current_offset, alignment); m_current_offset = Common::AlignUp(m_current_offset, alignment);
m_current_space = m_current_gpu_position - m_current_offset; m_current_space = m_current_gpu_position - m_current_offset - 1;
return true; return true;
} }
} }
@ -243,14 +244,11 @@ void StreamBuffer::CommitMemory(u32 final_num_bytes)
m_current_offset += final_num_bytes; m_current_offset += final_num_bytes;
m_current_space -= final_num_bytes; m_current_space -= final_num_bytes;
UpdateCurrentFencePosition();
} }
void StreamBuffer::UpdateCurrentFencePosition() void StreamBuffer::UpdateCurrentFencePosition()
{ {
// Don't create a tracking entry if the GPU is caught up with the buffer.
if (m_current_offset == m_current_gpu_position)
return;
// Has the offset changed since the last fence? // Has the offset changed since the last fence?
const u64 counter = g_vulkan_context->GetCurrentFenceCounter(); const u64 counter = g_vulkan_context->GetCurrentFenceCounter();
if (!m_tracked_fences.empty() && m_tracked_fences.back().first == counter) if (!m_tracked_fences.empty() && m_tracked_fences.back().first == counter)
@ -261,7 +259,6 @@ void StreamBuffer::UpdateCurrentFencePosition()
} }
// New buffer, so update the GPU position while we're at it. // New buffer, so update the GPU position while we're at it.
UpdateGPUPosition();
m_tracked_fences.emplace_back(counter, m_current_offset); m_tracked_fences.emplace_back(counter, m_current_offset);
} }