diff --git a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp index e440bc16af..b1ee66bda0 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp @@ -178,7 +178,10 @@ void VideoBackend::Initialize() OSD::AddMessage("Dolphin Direct3D11 Video Backend.", 5000); s_BackendInitialized = true; +} +void VideoBackend::Video_Prepare() +{ // Better be safe... s_efbAccessRequested = FALSE; s_FifoShuttingDown = FALSE; @@ -202,10 +205,7 @@ void VideoBackend::Initialize() CommandProcessor::Init(); PixelEngine::Init(); DLCache::Init(); -} -void VideoBackend::Video_Prepare() -{ // Tell the host that the window is ready Core::Callback_CoreMessage(WM_USER_CREATE); } diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp index cca6ed9753..340d72f80c 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp @@ -163,6 +163,10 @@ void VideoBackend::Initialize() OSD::AddMessage("Dolphin Direct3D9 Video Backend.", 5000); s_BackendInitialized = true; +} + +void VideoBackend::Video_Prepare() +{ // Better be safe... s_efbAccessRequested = FALSE; s_FifoShuttingDown = FALSE; @@ -182,10 +186,7 @@ void VideoBackend::Initialize() CommandProcessor::Init(); PixelEngine::Init(); DLCache::Init(); -} -void VideoBackend::Video_Prepare() -{ // Notify the core that the video backend is ready Core::Callback_CoreMessage(WM_USER_CREATE); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp index 9d2433f759..97e5692a0e 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp @@ -175,7 +175,12 @@ void VideoBackend::Initialize() OSD::AddMessage("Dolphin OpenGL Video Backend.", 5000); s_BackendInitialized = true; +} +// This is called after Initialize() from the Core +// Run from the graphics thread +void VideoBackend::Video_Prepare() +{ OpenGL_MakeCurrent(); g_renderer = new Renderer; @@ -202,13 +207,6 @@ void VideoBackend::Initialize() VertexLoaderManager::Init(); TextureConverter::Init(); DLCache::Init(); -} - -// This is called after Initialize() from the Core -// Run from the graphics thread -void VideoBackend::Video_Prepare() -{ - OpenGL_MakeCurrent(); // Notify the core that the video backend is ready Core::Callback_CoreMessage(WM_USER_CREATE);