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

Cocoa Port: Fix a potential deadlock that may occur on emulation reset.

This commit is contained in:
rogerman 2018-02-04 13:07:59 -08:00
parent 9ee7cd8ec0
commit d1dcbb8218
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
desmume/src/frontend/cocoa/cocoa_GPU.mm
View File

@ -914,11 +914,12 @@ public:
} }
else else
{ {
if (_needRestoreRender3DLock) if (_needRestoreRender3DLock && gpuEvent->GetRender3DNeedsFinish())
{ {
gpuEvent->Render3DLock(); gpuEvent->Render3DLock();
_needRestoreRender3DLock = NO;
} }
_needRestoreRender3DLock = NO;
} }
} }

2
desmume/src/gfx3d.cpp
View File

@ -567,6 +567,8 @@ void gfx3d_reset()
if (CurrentRenderer->GetRenderNeedsFinish()) if (CurrentRenderer->GetRenderNeedsFinish())
{ {
GPU->ForceRender3DFinishAndFlush(false); GPU->ForceRender3DFinishAndFlush(false);
CurrentRenderer->SetRenderNeedsFinish(false);
GPU->GetEventHandler()->DidRender3DEnd();
} }
#ifdef _SHOW_VTX_COUNTERS #ifdef _SHOW_VTX_COUNTERS