piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-26 07:39:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

Split VideoBackend::Cleanup from Shutdown.

Browse Source 
First is called from ogl/d3d thread, second is called from emulation thread (x11...)
This commit is contained in:
degasus
2013-02-26 16:42:32 +01:00
parent 90ff648d00
commit 4883fa268f
10 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Plugins/Plugin_VideoDX11/Src/VideoBackend.h
View File

@ -15,6 +15,7 @@ class VideoBackend : public VideoBackendHardware
std::string GetName();
void Video_Prepare();
void Video_Cleanup();
void ShowConfig(void* parent);

4
Source/Plugins/Plugin_VideoDX11/Src/main.cpp
View File

@ -207,6 +207,7 @@ void VideoBackend::Shutdown()
{
s_BackendInitialized = false;
// TODO: should be in Video_Cleanup
if (g_renderer)
{
s_efbAccessRequested = FALSE;
@ -234,4 +235,7 @@ void VideoBackend::Shutdown()
}
}
void VideoBackend::Video_Cleanup() {
}
}

1
Source/Plugins/Plugin_VideoDX9/Src/VideoBackend.h
View File

@ -15,6 +15,7 @@ class VideoBackend : public VideoBackendHardware
std::string GetName();
void Video_Prepare();
void Video_Cleanup();
void ShowConfig(void* parent);

4
Source/Plugins/Plugin_VideoDX9/Src/main.cpp
View File

@ -190,6 +190,7 @@ void VideoBackend::Shutdown()
{
s_BackendInitialized = false;
// TODO: should be in Video_Cleanup
if (g_renderer)
{
s_efbAccessRequested = FALSE;
@ -217,4 +218,7 @@ void VideoBackend::Shutdown()
D3D::Shutdown();
}
void VideoBackend::Video_Cleanup() {
}
}

1
Source/Plugins/Plugin_VideoOGL/Src/VideoBackend.h
View File

@ -15,6 +15,7 @@ class VideoBackend : public VideoBackendHardware
std::string GetName();
void Video_Prepare();
void Video_Cleanup();
void ShowConfig(void* parent);

5
Source/Plugins/Plugin_VideoOGL/Src/main.cpp
View File

@ -210,7 +210,11 @@ void VideoBackend::Video_Prepare()
void VideoBackend::Shutdown()
{
s_BackendInitialized = false;
GLInterface->Shutdown();
}
void VideoBackend::Video_Cleanup() {
if (g_renderer)
{
s_efbAccessRequested = false;
@ -236,7 +240,6 @@ void VideoBackend::Shutdown()
delete g_renderer;
g_renderer = NULL;
}
GLInterface->Shutdown();
}
}

6
Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
View File

@ -132,11 +132,17 @@ void VideoSoftware::EmuStateChange(EMUSTATE_CHANGE newState)
void VideoSoftware::Shutdown()
{
// TODO: should be in Video_Cleanup
HwRasterizer::Shutdown();
SWRenderer::Shutdown();
GLInterface->Shutdown();
}
void VideoSoftware::Video_Cleanup()
{
}
// This is called after Video_Initialize() from the Core
void VideoSoftware::Video_Prepare()
{

1
Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h
View File

@ -21,6 +21,7 @@ class VideoSoftware : public VideoBackend
void ShowConfig(void* parent);
void Video_Prepare();
void Video_Cleanup();
void Video_EnterLoop();
void Video_ExitLoop();