mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-21 03:55:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

d3d12: Fix alloc function

Browse source 
It may generate wrong result in very rare circumstance, although I never
experienced it.
This commit is contained in:
vlj 2015-06-26 18:31:51 +02:00 • committed by Vincent Lejeune
parent 3472f75ae0
commit fd269f3adc
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
rpcs3/Emu/RSX/D3D12/D3D12GSRender.h
View file

@ -137,26 +137,25 @@ struct DataHeap
*/
bool canAlloc(size_t size)
{
size_t putPos = m_putPos, getPos = m_getPos;
size_t allocSize = align(size, Alignment);
if (putPos + allocSize < m_size)
if (m_putPos + allocSize < m_size)
{
// range before get
if (putPos + allocSize < getPos)
if (m_putPos + allocSize < m_getPos)
return true;
// range after get
if (putPos > getPos)
if (m_putPos > m_getPos)
return true;
return false;
}
else
{
// ..]....[..get..
if (putPos < getPos)
if (m_putPos < m_getPos)
return false;
// ..get..]...[...
// Actually all resources extending beyond heap space starts at 0
if (allocSize > getPos)
if (allocSize > m_getPos)
return false;
return true;
}
@ -165,15 +164,16 @@ struct DataHeap
size_t alloc(size_t size)
{
assert(canAlloc(size));
size_t putPos = m_putPos;
if (putPos + size < m_size)
size_t allocSize = align(size, Alignment);
if (m_putPos + allocSize < m_size)
{
m_putPos += align(size, Alignment);
return putPos;
size_t oldPutPos = m_putPos;
m_putPos += allocSize;
return oldPutPos;
}
else
{
m_putPos = align(size, Alignment);
m_putPos = allocSize;
return 0;
}
}