Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-26 23:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

D3D12/StreamBuffer: Fix edge case of allocating buffer size

Browse source
This commit is contained in:
Connor McLaughlin 2021-07-11 13:32:17 +10:00
parent 096a92ba84
commit 9dab3f9b9b
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/common/d3d12/stream_buffer.cpp
View file

@ -56,7 +56,7 @@ bool StreamBuffer::ReserveMemory(u32 num_bytes, u32 alignment)
const u32 required_bytes = num_bytes + alignment; const u32 required_bytes = num_bytes + alignment;
// Check for sane allocations // Check for sane allocations
if (required_bytes > m_size) if (num_bytes > m_size)
{ {
Log_ErrorPrintf("Attempting to allocate %u bytes from a %u byte stream buffer", static_cast<u32>(num_bytes), Log_ErrorPrintf("Attempting to allocate %u bytes from a %u byte stream buffer", static_cast<u32>(num_bytes),
static_cast<u32>(m_size)); static_cast<u32>(m_size));
@ -68,8 +68,9 @@ bool StreamBuffer::ReserveMemory(u32 num_bytes, u32 alignment)
UpdateCurrentFencePosition(); UpdateCurrentFencePosition();
if (m_current_offset >= m_current_gpu_position) if (m_current_offset >= m_current_gpu_position)
{ {
const u32 aligned_required_bytes = (m_current_offset > 0) ? required_bytes : num_bytes;
const u32 remaining_bytes = m_size - m_current_offset; const u32 remaining_bytes = m_size - m_current_offset;
if (required_bytes <= remaining_bytes) if (aligned_required_bytes <= remaining_bytes)
{ {
// Place at the current position, after the GPU position. // Place at the current position, after the GPU position.
m_current_offset = Common::AlignUp(m_current_offset, alignment); m_current_offset = Common::AlignUp(m_current_offset, alignment);