The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-10 22:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Initialize video before HW as required by non-USE_WX platforms.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7189 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2011-02-17 19:13:44 +00:00
parent fa80f4074d
commit 2ce4b29ae2
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/Core/Src/Core.cpp
View File

@ -213,6 +213,14 @@ bool Init()
GetData<u8>("IPL.AR")); GetData<u8>("IPL.AR"));
} }
// _CoreParameter.hMainWindow is first the m_Panel handle,
// then it is updated to have the new window handle,
// within g_video_backend->Initialize()
// TODO: that's ugly, change Initialize() to take m_Panel
// and return the new window handle
g_video_backend->Initialize();
g_pWindowHandle = _CoreParameter.hMainWindow;
HW::Init(); HW::Init();
DSP::GetDSPEmulator()->Initialize(g_pWindowHandle, DSP::GetDSPEmulator()->Initialize(g_pWindowHandle,
_CoreParameter.bWii, _CoreParameter.bDSPThread); _CoreParameter.bWii, _CoreParameter.bDSPThread);
@ -370,12 +378,6 @@ void EmuThread()
emuThreadGoing.Set(); emuThreadGoing.Set();
// _CoreParameter.hMainWindow is first the m_Panel handle, then it is updated to have the new window handle,
// within g_video_backend->Initialize()
// TODO: that's ugly, change Initialize() to take m_Panel and return the new window handle
g_video_backend->Initialize();
g_pWindowHandle = _CoreParameter.hMainWindow;
DisplayMessage("CPU: " + cpu_info.Summarize(), 8000); DisplayMessage("CPU: " + cpu_info.Summarize(), 8000);
DisplayMessage(_CoreParameter.m_strFilename, 3000); DisplayMessage(_CoreParameter.m_strFilename, 3000);

2
Source/Core/DolphinWX/Src/Frame.cpp
View File

@ -686,10 +686,8 @@ void CFrame::OnHostMessage(wxCommandEvent& event)
void CFrame::GetRenderWindowSize(int& x, int& y, int& width, int& height) void CFrame::GetRenderWindowSize(int& x, int& y, int& width, int& height)
{ {
wxMutexGuiEnter();
m_RenderParent->GetClientSize(&width, &height); m_RenderParent->GetClientSize(&width, &height);
m_RenderParent->GetPosition(&x, &y); m_RenderParent->GetPosition(&x, &y);
wxMutexGuiLeave();
} }
void CFrame::OnRenderWindowSizeRequest(int width, int height) void CFrame::OnRenderWindowSizeRequest(int width, int height)

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

@ -538,7 +538,7 @@ void Renderer::DrawDebugInfo()
p+=sprintf(p, "FPS: %d\n", s_fps); p+=sprintf(p, "FPS: %d\n", s_fps);
if (g_ActiveConfig.bShowInputDisplay) if (g_ActiveConfig.bShowInputDisplay)
p+=sprintf(p, Frame::GetInputDisplay().c_str()); p+=sprintf(p, "%s", Frame::GetInputDisplay().c_str());
if (g_ActiveConfig.bShowEFBCopyRegions) if (g_ActiveConfig.bShowEFBCopyRegions)
{ {