From 7833ff25df5cb3bf10b363d30d7af8007094454a Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Wed, 13 Jan 2016 21:14:20 +0100
Subject: VideoBackends: Merge Initialize and Shutdown functions.

---
 Source/Core/VideoBackends/D3D/main.cpp | 76 +++++++++-------------------------
 1 file changed, 20 insertions(+), 56 deletions(-)

(limited to 'Source/Core/VideoBackends/D3D/main.cpp')

diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/main.cpp
index 8fd9989a92..791eda2a08 100644
--- a/Source/Core/VideoBackends/D3D/main.cpp
+++ b/Source/Core/VideoBackends/D3D/main.cpp
@@ -61,6 +61,11 @@ std::string VideoBackend::GetDisplayName() const
   return "Direct3D 11";
 }
 
+std::string VideoBackend::GetConfigName() const
+{
+  return "gfx_dx11";
+}
+
 void InitBackendInfo()
 {
   HRESULT hr = DX11::D3D::LoadDXGI();
@@ -141,7 +146,7 @@ void InitBackendInfo()
 void VideoBackend::ShowConfig(void* hParent)
 {
   InitBackendInfo();
-  Host_ShowVideoConfig(hParent, GetDisplayName(), "gfx_dx11");
+  Host_ShowVideoConfig(hParent, GetDisplayName(), GetConfigName());
 }
 
 bool VideoBackend::Initialize(void* window_handle)
@@ -149,23 +154,10 @@ bool VideoBackend::Initialize(void* window_handle)
   if (window_handle == nullptr)
     return false;
 
-  InitializeShared();
   InitBackendInfo();
-
-  frameCount = 0;
-
-  if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini"))
-    g_Config.Load(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini");
-  else
-    g_Config.Load(File::GetUserPath(D_CONFIG_IDX) + "gfx_dx11.ini");
-
-  g_Config.GameIniLoad();
-  g_Config.UpdateProjectionHack();
-  g_Config.VerifyValidity();
-  UpdateActiveConfig();
+  InitializeShared();
 
   m_window_handle = window_handle;
-  m_initialized = true;
 
   return true;
 }
@@ -181,55 +173,27 @@ void VideoBackend::Video_Prepare()
   PixelShaderCache::Init();
   GeometryShaderCache::Init();
   D3D::InitUtils();
-
-  // VideoCommon
-  BPInit();
-  Fifo::Init();
-  IndexGenerator::Init();
-  VertexLoaderManager::Init();
-  OpcodeDecoder::Init();
-  VertexShaderManager::Init();
-  PixelShaderManager::Init();
-  GeometryShaderManager::Init();
-  CommandProcessor::Init();
-  PixelEngine::Init();
-  BBox::Init();
-
-  // Tell the host that the window is ready
-  Host_Message(WM_USER_CREATE);
 }
 
 void VideoBackend::Shutdown()
 {
-  m_initialized = false;
-
   // TODO: should be in Video_Cleanup
-  if (g_renderer)
-  {
-    // VideoCommon
-    Fifo::Shutdown();
-    CommandProcessor::Shutdown();
-    GeometryShaderManager::Shutdown();
-    PixelShaderManager::Shutdown();
-    VertexShaderManager::Shutdown();
-    OpcodeDecoder::Shutdown();
-    VertexLoaderManager::Shutdown();
-
-    // internal interfaces
-    D3D::ShutdownUtils();
-    PixelShaderCache::Shutdown();
-    VertexShaderCache::Shutdown();
-    GeometryShaderCache::Shutdown();
-    BBox::Shutdown();
-
-    g_perf_query.reset();
-    g_vertex_manager.reset();
-    g_texture_cache.reset();
-    g_renderer.reset();
-  }
+  D3D::ShutdownUtils();
+  PixelShaderCache::Shutdown();
+  VertexShaderCache::Shutdown();
+  GeometryShaderCache::Shutdown();
+  BBox::Shutdown();
+
+  g_perf_query.reset();
+  g_vertex_manager.reset();
+  g_texture_cache.reset();
+  g_renderer.reset();
+
+  ShutdownShared();
 }
 
 void VideoBackend::Video_Cleanup()
 {
+  CleanupShared();
 }
 }
-- 
cgit v1.2.3


From 5f2f4620676198bb63eeb169358435037491d4ad Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Wed, 13 Jan 2016 21:38:11 +0100
Subject: VideoBackends: Merge ShowConfig functions.

---
 Source/Core/VideoBackends/D3D/main.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'Source/Core/VideoBackends/D3D/main.cpp')

diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/main.cpp
index 791eda2a08..c900e2aa37 100644
--- a/Source/Core/VideoBackends/D3D/main.cpp
+++ b/Source/Core/VideoBackends/D3D/main.cpp
@@ -66,7 +66,7 @@ std::string VideoBackend::GetConfigName() const
   return "gfx_dx11";
 }
 
-void InitBackendInfo()
+void VideoBackend::InitBackendInfo()
 {
   HRESULT hr = DX11::D3D::LoadDXGI();
   if (SUCCEEDED(hr))
@@ -143,12 +143,6 @@ void InitBackendInfo()
   DX11::D3D::UnloadD3D();
 }
 
-void VideoBackend::ShowConfig(void* hParent)
-{
-  InitBackendInfo();
-  Host_ShowVideoConfig(hParent, GetDisplayName(), GetConfigName());
-}
-
 bool VideoBackend::Initialize(void* window_handle)
 {
   if (window_handle == nullptr)
-- 
cgit v1.2.3


From d79aeaa1e9b224b3bb147c605fb8ffd6e2bfc890 Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Sun, 26 Jun 2016 08:06:23 +0200
Subject: VideoCommon: Drop GetConfigName.

We're past 5.0 now, so there is no need to look for old inis.
---
 Source/Core/VideoBackends/D3D/main.cpp | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'Source/Core/VideoBackends/D3D/main.cpp')

diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/main.cpp
index c900e2aa37..e630c177f9 100644
--- a/Source/Core/VideoBackends/D3D/main.cpp
+++ b/Source/Core/VideoBackends/D3D/main.cpp
@@ -61,11 +61,6 @@ std::string VideoBackend::GetDisplayName() const
   return "Direct3D 11";
 }
 
-std::string VideoBackend::GetConfigName() const
-{
-  return "gfx_dx11";
-}
-
 void VideoBackend::InitBackendInfo()
 {
   HRESULT hr = DX11::D3D::LoadDXGI();
-- 
cgit v1.2.3