MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-02 09:03:37 +00:00
Code Issues Projects Releases Wiki Activity

Fix RDRAMtoFrameBuffer::CopyFromRDRAM:

Browse Source 
clear buffer in RDRAM only when current buffer was changed.
Otherwise it is possible that game already uses the buffer for other purpose,
and the clear will overwrite the data.

Fixed Donkey Kong 64 intro, issue #308
This commit is contained in:
Sergey Lipskiy 2015-03-30 18:06:21 +06:00
parent 1b8f6f2240
commit 4553f0345e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
FrameBuffer.cpp
View File

@ -298,12 +298,12 @@ void FrameBufferList::correctHeight()
}
}
void FrameBufferList::clearBuffersChanged()
{
gDP.colorImage.changed = FALSE;
for (FrameBuffers::iterator iter = m_list.begin(); iter != m_list.end(); ++iter)
iter->m_changed = false;
FrameBuffer * pBuffer = frameBufferList().findBuffer(*REG.VI_ORIGIN);
if (pBuffer != NULL)
pBuffer->m_changed = false;
}
FrameBuffer * FrameBufferList::findBuffer(u32 _startAddress)
@ -1046,6 +1046,7 @@ void RDRAMtoFrameBuffer::CopyFromRDRAM( u32 _address, bool _bUseAlpha)
if (pBuffer->m_startAddress == _address && gDP.colorImage.changed != 0)
return;
const bool bUseAlpha = _bUseAlpha && pBuffer->m_changed;
const u32 address = pBuffer->m_startAddress;
const u32 width = pBuffer->m_width;
const u32 height = pBuffer->m_startAddress == _address ? VI.real_height : pBuffer->m_height;
@ -1081,7 +1082,7 @@ void RDRAMtoFrameBuffer::CopyFromRDRAM( u32 _address, bool _bUseAlpha)
if (idx >= bound)
break;
col = src[idx];
if (_bUseAlpha)
if (bUseAlpha)
src[idx] = 0;
empty |= col;
r = ((col >> 11)&31)<<3;
@ -1104,7 +1105,7 @@ void RDRAMtoFrameBuffer::CopyFromRDRAM( u32 _address, bool _bUseAlpha)
if (idx >= bound)
break;
col = src[idx];
if (_bUseAlpha)
if (bUseAlpha)
src[idx] = 0;
empty |= col;
r = (col >> 24) & 0xff;