Merge 141f624fc1 into b65c096be5

debugger: Fix wait_tree crash.

src/core/hle/service/nvflinger/nvflinger.cpp

@@ -7,6 +7,7 @@
 #include "common/alignment.h"
 #include "common/scope_exit.h"
 #include "core/core_timing.h"
+#include "core/core.h"
 #include "core/hle/service/nvdrv/devices/nvdisp_disp0.h"
 #include "core/hle/service/nvdrv/nvdrv.h"
 #include "core/hle/service/nvflinger/buffer_queue.h"
@@ -129,6 +130,7 @@ void NVFlinger::Compose() {
 
         if (buffer == boost::none) {
             // There was no queued buffer to draw, render previous frame
+            Core::System::GetInstance().perf_stats.EndGameFrame();
             VideoCore::g_renderer->SwapBuffers({});
             continue;
         }

src/video_core/engines/maxwell_3d.h

@@ -14,7 +14,7 @@ namespace Engines {
 
 class Maxwell3D final {
 public:
-    Maxwell3D(MemoryManager& memory_manager);
+    explicit Maxwell3D(MemoryManager& memory_manager);
     ~Maxwell3D() = default;
 
     /// Write the value to the register identified by method.

src/yuzu/debugger/wait_tree.cpp

@@ -168,7 +168,7 @@ QString WaitTreeThread::GetText() const {
     }
     QString pc_info = tr(" PC = 0x%1 LR = 0x%2")
                           .arg(thread.context.pc, 8, 16, QLatin1Char('0'))
-                          .arg(thread.context.cpu_registers[31], 8, 16, QLatin1Char('0'));
+                          .arg(thread.context.cpu_registers[30], 8, 16, QLatin1Char('0'));
     return WaitTreeWaitObject::GetText() + pc_info + " (" + status + ") ";
 }