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

Merge pull request #10258 from Pokechu22/fifoplayer-efb-clear 

FifoPlayer: Clear EFB before starting playback
This commit is contained in:
Scott Mansell 2021-12-03 00:22:27 +13:00 committed by GitHub
parent fc1ed33c11 5af18773bf
commit 26e4e67d45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@
#include "Core/PowerPC/PowerPC.h"
#include "VideoCommon/BPMemory.h"
#include "VideoCommon/CommandProcessor.h"
#include "VideoCommon/VideoCommon.h"
// We need to include TextureDecoder.h for the texMem array.
// TODO: Move texMem somewhere else so this isn't an issue.
@ -452,6 +453,45 @@ void FifoPlayer::SetupFifo()
WriteCP(CommandProcessor::CTRL_REGISTER, 17); // enable read & GP link
}
void FifoPlayer::ClearEfb()
{
// Trigger a bogus EFB copy to clear the screen
// 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
X10Y10 tl;
tl.x = 0;
tl.y = 0;
LoadBPReg(BPMEM_EFB_TL, tl.hex);
X10Y10 wh;
wh.x = EFB_WIDTH - 1;
wh.y = EFB_HEIGHT - 1;
LoadBPReg(BPMEM_EFB_WH, wh.hex);
LoadBPReg(BPMEM_MIPMAP_STRIDE, 0x140);
// The clear color and Z value have already been loaded via LoadRegisters()
LoadBPReg(BPMEM_EFB_ADDR, 0);
UPE_Copy copy;
copy.clamp_top = false;
copy.clamp_bottom = false;
copy.yuv = false;
copy.target_pixel_format = static_cast<u32>(EFBCopyFormat::RGBA8) << 1;
copy.gamma = 0;
copy.half_scale = false;
copy.scale_invert = false;
copy.clear = true;
copy.frame_to_field = FrameToField::Progressive;
copy.copy_to_xfb = false;
copy.intensity_fmt = false;
copy.auto_conv = false;
LoadBPReg(BPMEM_TRIGGER_EFB_COPY, copy.Hex);
// Restore existing data - this only works at the start of the fifolog.
// In practice most fifologs probably explicitly specify the size each time, but this is still
// probably a good idea.
LoadBPReg(BPMEM_EFB_TL, m_File->GetBPMem()[BPMEM_EFB_TL]);
LoadBPReg(BPMEM_EFB_WH, m_File->GetBPMem()[BPMEM_EFB_WH]);
LoadBPReg(BPMEM_MIPMAP_STRIDE, m_File->GetBPMem()[BPMEM_MIPMAP_STRIDE]);
LoadBPReg(BPMEM_EFB_ADDR, m_File->GetBPMem()[BPMEM_EFB_ADDR]);
}
void FifoPlayer::LoadMemory()
{
UReg_MSR newMSR;
@ -469,6 +509,7 @@ void FifoPlayer::LoadMemory()
SetupFifo();
LoadRegisters();
ClearEfb();
LoadTextureMemory();
FlushWGP();
}

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

@ -123,6 +123,7 @@ private:
void LoadMemory();
void LoadRegisters();
void LoadTextureMemory();
void ClearEfb();
void WriteCP(u32 address, u16 value);
void WritePI(u32 address, u32 value);