ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FifoPlayer: Sleep while high watermark is set.

This commit is contained in:
degasus 2016-01-11 23:50:26 +01:00
parent 159d83c5a9
commit a4a2928905
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Source/Core/Core/FifoPlayer/FifoPlayer.cpp
View File

@ -82,9 +82,6 @@ bool FifoPlayer::Play()
if (m_Loop) if (m_Loop)
{ {
m_CurrentFrame = m_FrameRangeStart; m_CurrentFrame = m_FrameRangeStart;
PowerPC::ppcState.downcount = 0;
CoreTiming::Advance();
} }
else else
{ {
@ -233,6 +230,13 @@ void FifoPlayer::WriteFrame(const FifoFrameInfo& frame, const AnalyzedFrameInfo&
WriteFramePart(position, frame.fifoDataSize, memoryUpdate, frame, info); WriteFramePart(position, frame.fifoDataSize, memoryUpdate, frame, info);
FlushWGP(); FlushWGP();
// Sleep while the GPU is active
while (!IsIdleSet())
{
CoreTiming::Idle();
CoreTiming::Advance();
}
} }
void FifoPlayer::WriteFramePart(u32 dataStart, u32 dataEnd, u32& nextMemUpdate, const FifoFrameInfo& frame, const AnalyzedFrameInfo& info) void FifoPlayer::WriteFramePart(u32 dataStart, u32 dataEnd, u32& nextMemUpdate, const FifoFrameInfo& frame, const AnalyzedFrameInfo& info)
@ -300,6 +304,12 @@ void FifoPlayer::WriteFifo(u8* data, u32 start, u32 end)
// Write up to 256 bytes at a time // Write up to 256 bytes at a time
while (written < end) while (written < end)
{ {
while (IsHighWatermarkSet())
{
CoreTiming::Idle();
CoreTiming::Advance();
}
u32 burstEnd = std::min(written + 255, lastBurstEnd); u32 burstEnd = std::min(written + 255, lastBurstEnd);
while (written < burstEnd) while (written < burstEnd)
@ -330,8 +340,8 @@ void FifoPlayer::SetupFifo()
WriteCP(CommandProcessor::FIFO_END_LO, frame.fifoEnd); WriteCP(CommandProcessor::FIFO_END_LO, frame.fifoEnd);
WriteCP(CommandProcessor::FIFO_END_HI, frame.fifoEnd >> 16); WriteCP(CommandProcessor::FIFO_END_HI, frame.fifoEnd >> 16);
// Set watermarks // Set watermarks, high at 75%, low at 0%
u32 hi_watermark = frame.fifoEnd - frame.fifoStart; u32 hi_watermark = (frame.fifoEnd - frame.fifoStart) * 3 / 4;
WriteCP(CommandProcessor::FIFO_HI_WATERMARK_LO, hi_watermark); WriteCP(CommandProcessor::FIFO_HI_WATERMARK_LO, hi_watermark);
WriteCP(CommandProcessor::FIFO_HI_WATERMARK_HI, hi_watermark >> 16); WriteCP(CommandProcessor::FIFO_HI_WATERMARK_HI, hi_watermark >> 16);
WriteCP(CommandProcessor::FIFO_LO_WATERMARK_LO, 0); WriteCP(CommandProcessor::FIFO_LO_WATERMARK_LO, 0);
@ -479,3 +489,15 @@ bool FifoPlayer::ShouldLoadBP(u8 address)
return true; return true;
} }
} }
bool FifoPlayer::IsIdleSet()
{
CommandProcessor::UCPStatusReg status = PowerPC::Read_U16(0xCC000000 | CommandProcessor::STATUS_REGISTER);
return status.CommandIdle;
}
bool FifoPlayer::IsHighWatermarkSet()
{
CommandProcessor::UCPStatusReg status = PowerPC::Read_U16(0xCC000000 | CommandProcessor::STATUS_REGISTER);
return status.OverflowHiWatermark;
}

3
Source/Core/Core/FifoPlayer/FifoPlayer.h
View File

@ -113,6 +113,9 @@ private:
bool ShouldLoadBP(u8 address); bool ShouldLoadBP(u8 address);
static bool IsIdleSet();
static bool IsHighWatermarkSet();
bool m_Loop; bool m_Loop;
u32 m_CurrentFrame; u32 m_CurrentFrame;