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

Making sure nothing broke on windows 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@745 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-10-02 17:12:47 +00:00
parent 4923da76d7
commit 29fdb6837a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/VideoCommon/Src/Fifo.cpp
View File

@ -168,8 +168,12 @@ void Fifo_EnterLoop(const SVideoInitialize &video_initialize)
if (hEventOnIdle==NULL) PanicAlert("Fifo_EnterLoop() -> EventOnIdle NULL"); if (hEventOnIdle==NULL) PanicAlert("Fifo_EnterLoop() -> EventOnIdle NULL");
#endif #endif
#ifdef _WIN32
// TODO(ector): Don't peek so often! // TODO(ector): Don't peek so often!
while (fifoStateRun || video_initialize.pPeekMessages()) while (video_initialize.pPeekMessages())
#else
while (fifoStateRun)
#endif
{ {
#if defined(THREAD_VIDEO_WAKEUP_ONIDLE) && defined(_WIN32) #if defined(THREAD_VIDEO_WAKEUP_ONIDLE) && defined(_WIN32)
if (MsgWaitForMultipleObjects(1, &hEventOnIdle, FALSE, 1L, QS_ALLEVENTS) == WAIT_ABANDONED) if (MsgWaitForMultipleObjects(1, &hEventOnIdle, FALSE, 1L, QS_ALLEVENTS) == WAIT_ABANDONED)

2
Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp
View File

@ -94,7 +94,7 @@ BOOL Callback_PeekMessages()
#else // GLX #else // GLX
// This is called from Outside of our video thread, from EmuThread // This is called from Outside of our video thread, from EmuThread
// The calls are NOT thread safe, so it breaks everything // The calls are NOT thread safe, so it breaks everything
return FALSE; return FALSE;
#endif #endif
} }