ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Vulkan: Fix crash on shutdown with Virtual XFB enabled

This commit is contained in:
Stenzek 2017-10-18 22:11:59 +10:00
parent 774fca4d01
commit 271f1af8c9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/VideoBackends/Vulkan/main.cpp
View File

@ -218,7 +218,7 @@ bool VideoBackend::Initialize(void* window_handle)
// These have to be done before the others because the destructors // These have to be done before the others because the destructors
// for the remaining classes may call methods on these. // for the remaining classes may call methods on these.
if (!g_object_cache->Initialize() || !g_shader_cache->Initialize() || if (!g_object_cache->Initialize() || !g_shader_cache->Initialize() ||
!FramebufferManager::GetInstance()->Initialize() || !StateTracker::CreateInstance() || !StateTracker::CreateInstance() || !FramebufferManager::GetInstance()->Initialize() ||
!Renderer::GetInstance()->Initialize()) !Renderer::GetInstance()->Initialize())
{ {
PanicAlert("Failed to initialize Vulkan classes."); PanicAlert("Failed to initialize Vulkan classes.");
@ -269,8 +269,8 @@ void VideoBackend::Shutdown()
g_texture_cache.reset(); g_texture_cache.reset();
g_vertex_manager.reset(); g_vertex_manager.reset();
g_renderer.reset(); g_renderer.reset();
StateTracker::DestroyInstance();
g_framebuffer_manager.reset(); g_framebuffer_manager.reset();
StateTracker::DestroyInstance();
if (g_shader_cache) if (g_shader_cache)
g_shader_cache->Shutdown(); g_shader_cache->Shutdown();
g_shader_cache.reset(); g_shader_cache.reset();