piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed broken CPU EFB access on DX plugin, helps Wind Waker and ZTP not to hang

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4116 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
sl1nk3.s
2009-08-31 16:10:36 +00:00
parent 0dcf03b898
commit 94bc6d7f36
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Source/Plugins/Plugin_VideoDX9/Src/main.cpp
View File

@ -268,14 +268,12 @@ void Video_SendFifoData(u8* _uData, u32 len)
void VideoFifo_CheckSwapRequest()
{
// CPU swap unimplemented
}
void VideoFifo_CheckSwapRequestAt(u32 xfbAddr, u32 fbWidth, u32 fbHeight)
{
}
void VideoFifo_CheckEFBAccess()
{
// CPU swap unimplemented
}
void Video_BeginField(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight)
@ -346,7 +344,7 @@ void Video_Screenshot(const char *_szFilename)
}
}
void Video_OnThreadAccessEFB()
void VideoFifo_CheckEFBAccess()
{
s_criticalEFB.Enter();
s_AccessEFBResult = 0;
@ -371,7 +369,8 @@ void Video_OnThreadAccessEFB()
}
*/
s_AccessEFBDone.Set();
if (g_VideoInitialize.bUseDualCore)
s_AccessEFBDone.Set();
s_criticalEFB.Leave();
}
@ -380,30 +379,30 @@ u32 Video_AccessEFB(EFBAccessType type, u32 x, u32 y)
{
u32 result;
s_criticalEFB.Enter();
s_criticalEFB.Enter();
s_AccessEFBType = type;
s_EFBx = x;
s_EFBy = y;
if (g_VideoInitialize.bUseDualCore)
{
s_AccessEFBDone.Init();
}
s_criticalEFB.Leave();
s_criticalEFB.Leave();
if (g_VideoInitialize.bUseDualCore)
s_AccessEFBDone.Wait();
else
Video_OnThreadAccessEFB();
VideoFifo_CheckEFBAccess();
s_criticalEFB.Enter();
s_criticalEFB.Enter();
if (g_VideoInitialize.bUseDualCore)
s_AccessEFBDone.Shutdown();
result = s_AccessEFBResult;
s_criticalEFB.Leave();
s_criticalEFB.Leave();
return result;
}