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

Missed a critical section. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7295 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Jordan Woyak 2011-03-05 12:05:58 +00:00
parent 423018f811
commit e16e177148
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Src/DSP/DSPCore.h
View File

@ -249,7 +249,7 @@ struct SDSP
volatile u16 mbox[2][2]; volatile u16 mbox[2][2];
// Mutex protecting the mailbox. // Mutex protecting the mailbox.
std::mutex g_CriticalSection; //std::mutex g_CriticalSection;
// Accelerator / DMA / other hardware registers. Not GPRs. // Accelerator / DMA / other hardware registers. Not GPRs.
u16 ifx_regs[256]; u16 ifx_regs[256];

5
Source/Core/VideoCommon/Src/BPStructs.cpp
View File

@ -96,7 +96,7 @@ void BPWritten(const BPCmd& bp)
//} //}
// FIXME: Hangs load-state, but should fix graphic-heavy games state loading // FIXME: Hangs load-state, but should fix graphic-heavy games state loading
//s_bpCritical.Enter(); //std::lock_guard<std::mutex> lk(s_bpCritical);
// BEGIN ZTP SPEEDUP HACK CHANGES // BEGIN ZTP SPEEDUP HACK CHANGES
// This hunk of code disables the usual pipeline flush for certain BP Writes // This hunk of code disables the usual pipeline flush for certain BP Writes
@ -631,9 +631,6 @@ void BPWritten(const BPCmd& bp)
break; break;
} }
} }
// FIXME: Hangs load-state, but should fix graphic-heavy games state loading
//s_bpCritical.Leave();
} }
} }

3
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
View File

@ -1224,7 +1224,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
#else #else
if (g_ActiveConfig.bDumpFrames) if (g_ActiveConfig.bDumpFrames)
{ {
s_criticalScreenshot.Enter(); std::lock_guard<std::mutex> lk(s_criticalScreenshot);
std::string movie_file_name; std::string movie_file_name;
w = dst_rect.GetWidth(); w = dst_rect.GetWidth();
h = dst_rect.GetHeight(); h = dst_rect.GetHeight();
@ -1256,7 +1256,6 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
} }
delete[] data; delete[] data;
s_criticalScreenshot.Leave();
} }
else else
{ {