mirrors/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-15 16:53:27 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10273 from Pokechu22/fifoplayer-efb-clear-wait

Browse Source 
FifoPlayer: Wait after clearing the screen
This commit is contained in:
JMC47 2021-12-27 02:01:02 -05:00 committed by GitHub
commit 1f1e78ee7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,6 +214,9 @@ public:
void Init() override void Init() override
{ {
IsPlayingBackFifologWithBrokenEFBCopies = m_parent->m_File->HasBrokenEFBCopies(); IsPlayingBackFifologWithBrokenEFBCopies = m_parent->m_File->HasBrokenEFBCopies();
// Without this call, we deadlock in initialization in dual core, as the FIFO is disabled and
// thus ClearEfb()'s call to WaitForGPUInactive() never returns
CPU::EnableStepping(false);
m_parent->m_CurrentFrame = m_parent->m_FrameRangeStart; m_parent->m_CurrentFrame = m_parent->m_FrameRangeStart;
m_parent->LoadMemory(); m_parent->LoadMemory();
@ -422,13 +425,7 @@ void FifoPlayer::WriteFrame(const FifoFrameInfo& frame, const AnalyzedFrameInfo&
} }
FlushWGP(); FlushWGP();
WaitForGPUInactive();
// Sleep while the GPU is active
while (!IsIdleSet() && CPU::GetState() != CPU::State::PowerDown)
{
CoreTiming::Idle();
CoreTiming::Advance();
}
} }
void FifoPlayer::WriteFramePart(const FramePart& part, u32* next_mem_update, void FifoPlayer::WriteFramePart(const FramePart& part, u32* next_mem_update,
@ -571,18 +568,18 @@ void FifoPlayer::ClearEfb()
// Trigger a bogus EFB copy to clear the screen // Trigger a bogus EFB copy to clear the screen
// The target address is 0, and there shouldn't be anything there, // The target address is 0, and there shouldn't be anything there,
// but even if there is it should be loaded in by LoadTextureMemory afterwards // but even if there is it should be loaded in by LoadTextureMemory afterwards
X10Y10 tl; X10Y10 tl = bpmem.copyTexSrcXY;
tl.x = 0; tl.x = 0;
tl.y = 0; tl.y = 0;
LoadBPReg(BPMEM_EFB_TL, tl.hex); LoadBPReg(BPMEM_EFB_TL, tl.hex);
X10Y10 wh; X10Y10 wh = bpmem.copyTexSrcWH;
wh.x = EFB_WIDTH - 1; wh.x = EFB_WIDTH - 1;
wh.y = EFB_HEIGHT - 1; wh.y = EFB_HEIGHT - 1;
LoadBPReg(BPMEM_EFB_WH, wh.hex); LoadBPReg(BPMEM_EFB_WH, wh.hex);
LoadBPReg(BPMEM_MIPMAP_STRIDE, 0x140); LoadBPReg(BPMEM_MIPMAP_STRIDE, 0x140);
// The clear color and Z value have already been loaded via LoadRegisters() // The clear color and Z value have already been loaded via LoadRegisters()
LoadBPReg(BPMEM_EFB_ADDR, 0); LoadBPReg(BPMEM_EFB_ADDR, 0);
UPE_Copy copy; UPE_Copy copy = bpmem.triggerEFBCopy;
copy.clamp_top = false; copy.clamp_top = false;
copy.clamp_bottom = false; copy.clamp_bottom = false;
copy.yuv = false; copy.yuv = false;
@ -603,6 +600,10 @@ void FifoPlayer::ClearEfb()
LoadBPReg(BPMEM_EFB_WH, m_File->GetBPMem()[BPMEM_EFB_WH]); LoadBPReg(BPMEM_EFB_WH, m_File->GetBPMem()[BPMEM_EFB_WH]);
LoadBPReg(BPMEM_MIPMAP_STRIDE, m_File->GetBPMem()[BPMEM_MIPMAP_STRIDE]); LoadBPReg(BPMEM_MIPMAP_STRIDE, m_File->GetBPMem()[BPMEM_MIPMAP_STRIDE]);
LoadBPReg(BPMEM_EFB_ADDR, m_File->GetBPMem()[BPMEM_EFB_ADDR]); LoadBPReg(BPMEM_EFB_ADDR, m_File->GetBPMem()[BPMEM_EFB_ADDR]);
// Wait for the EFB copy to finish. That way, the EFB copy (which will be performed at a later
// time) won't clobber any memory updates.
FlushWGP();
WaitForGPUInactive();
} }
void FifoPlayer::LoadMemory() void FifoPlayer::LoadMemory()
@ -695,6 +696,16 @@ void FifoPlayer::FlushWGP()
GPFifo::ResetGatherPipe(); GPFifo::ResetGatherPipe();
} }
void FifoPlayer::WaitForGPUInactive()
{
// Sleep while the GPU is active
while (!IsIdleSet() && CPU::GetState() != CPU::State::PowerDown)
{
CoreTiming::Idle();
CoreTiming::Advance();
}
}
void FifoPlayer::LoadBPReg(u8 reg, u32 value) void FifoPlayer::LoadBPReg(u8 reg, u32 value)
{ {
GPFifo::Write8(0x61); // load BP reg GPFifo::Write8(0x61); // load BP reg

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

@ -159,6 +159,7 @@ private:
void WritePI(u32 address, u32 value); void WritePI(u32 address, u32 value);
void FlushWGP(); void FlushWGP();
void WaitForGPUInactive();
void LoadBPReg(u8 reg, u32 value); void LoadBPReg(u8 reg, u32 value);
void LoadCPReg(u8 reg, u32 value); void LoadCPReg(u8 reg, u32 value);