VideoBackends: Merge Initialize and Shutdown functions.

1 files changed, 3 insertions, 32 deletions

diff --git a/Source/Core/VideoBackends/Null/NullBackend.cpp b/Source/Core/VideoBackends/Null/NullBackend.cpp
index 7a1691b9d5..2a1555ed27 100644
--- a/Source/Core/VideoBackends/Null/NullBackend.cpp
+++ b/Source/Core/VideoBackends/Null/NullBackend.cpp
@@ -53,7 +53,7 @@ static void InitBackendInfo()
 void VideoBackend::ShowConfig(void* parent)
 {
   InitBackendInfo();
-  Host_ShowVideoConfig(parent, GetDisplayName(), "gfx_null");
+  Host_ShowVideoConfig(parent, GetDisplayName(), GetConfigName());
 }
 
 bool VideoBackend::Initialize(void* window_handle)
@@ -61,28 +61,6 @@ bool VideoBackend::Initialize(void* window_handle)
   InitializeShared();
   InitBackendInfo();
 
-  // Load Configs
-  g_Config.Load(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini");
-  g_Config.GameIniLoad();
-  g_Config.UpdateProjectionHack();
-  g_Config.VerifyValidity();
-  UpdateActiveConfig();
-
-  // Do our OSD callbacks
-  OSD::DoCallbacks(OSD::CallbackType::Initialization);
-
-  // Initialize VideoCommon
-  CommandProcessor::Init();
-  PixelEngine::Init();
-  BPInit();
-  Fifo::Init();
-  OpcodeDecoder::Init();
-  IndexGenerator::Init();
-  VertexShaderManager::Init();
-  PixelShaderManager::Init();
-  VertexLoaderManager::Init();
-  Host_Message(WM_USER_CREATE);
-
   return true;
 }
 
@@ -102,19 +80,12 @@ void VideoBackend::Video_Prepare()
 
 void VideoBackend::Shutdown()
 {
-  // Shutdown VideoCommon
-  Fifo::Shutdown();
-  VertexLoaderManager::Shutdown();
-  VertexShaderManager::Shutdown();
-  PixelShaderManager::Shutdown();
-  OpcodeDecoder::Shutdown();
-
-  // Do our OSD callbacks
-  OSD::DoCallbacks(OSD::CallbackType::Shutdown);
+  ShutdownShared();
 }
 
 void VideoBackend::Video_Cleanup()
 {
+  CleanupShared();
   PixelShaderCache::s_instance.reset();
   VertexShaderCache::s_instance.reset();
   GeometryShaderCache::s_instance.reset();