From 4883fa268fa60751a2c1fc0dd77ce022987daf21 Mon Sep 17 00:00:00 2001 From: degasus Date: Tue, 26 Feb 2013 16:42:32 +0100 Subject: Split VideoBackend::Cleanup from Shutdown. First is called from ogl/d3d thread, second is called from emulation thread (x11...) --- Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp | 6 ++++++ Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h | 1 + 2 files changed, 7 insertions(+) (limited to 'Source/Plugins/Plugin_VideoSoftware') diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp index 7d823eff42..5899d82c39 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp @@ -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() { diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h b/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h index 3e1490031f..a0826862ce 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h @@ -21,6 +21,7 @@ class VideoSoftware : public VideoBackend void ShowConfig(void* parent); void Video_Prepare(); + void Video_Cleanup(); void Video_EnterLoop(); void Video_ExitLoop(); -- cgit v1.2.3