Merge remote-tracking branch 'upstream/master' into feature/savestates-2

2020-03-28 12:33:21 +00:00
parent 5a6093843e 475b0fb159
commit 7049af744f
77 changed files with 18323 additions and 11473 deletions
--- a/src/video_core/video_core.cpp
+++ b/src/video_core/video_core.cpp
@ -59,6 +59,7 @@ ResultStatus Init(Frontend::EmuWindow& emu_window, Memory::MemorySystem& memory)
 void Shutdown() {
    Pica::Shutdown();

+    g_renderer->ShutDown();
    g_renderer.reset();

    LOG_DEBUG(Render, "shutdown OK");