From 5860c97144a01c4203e98671e158086c672bcf97 Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Tue, 21 Nov 2017 19:56:22 +1000
Subject: [PATCH] D3D: Move device release from Renderer destructor to shutdown

Necessary if we wish to have GPU objects in our base class, as otherwise
the device will be released before the objects.
---
 Source/Core/VideoBackends/D3D/Render.cpp | 1 -
 Source/Core/VideoBackends/D3D/main.cpp   | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp
index a14a71a24a..3c27a41d85 100644
--- a/Source/Core/VideoBackends/D3D/Render.cpp
+++ b/Source/Core/VideoBackends/D3D/Render.cpp
@@ -86,7 +86,6 @@ Renderer::Renderer() : ::Renderer(D3D::GetBackBufferWidth(), D3D::GetBackBufferH
 Renderer::~Renderer()
 {
   TeardownDeviceObjects();
-  D3D::Close();
 }
 
 void Renderer::SetupDeviceObjects()
diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/main.cpp
index a146a4d25a..f29e079d61 100644
--- a/Source/Core/VideoBackends/D3D/main.cpp
+++ b/Source/Core/VideoBackends/D3D/main.cpp
@@ -181,6 +181,8 @@ void VideoBackend::Shutdown()
   g_texture_cache.reset();
   g_renderer.reset();
 
+  D3D::Close();
+
   ShutdownShared();
 }