From aaeba6759e6d57968ce0b12f6245f45836dec546 Mon Sep 17 00:00:00 2001
From: Vitor K <vitor-kiguchi@hotmail.com>
Date: Fri, 4 Aug 2023 20:35:52 -0300
Subject: [PATCH] citra_qt: do not pass memory to widget (#6849)

---
 src/citra_qt/debugger/graphics/graphics_cmdlists.cpp | 7 ++++---
 src/citra_qt/debugger/graphics/graphics_cmdlists.h   | 8 ++++----
 src/citra_qt/main.cpp                                | 2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/citra_qt/debugger/graphics/graphics_cmdlists.cpp b/src/citra_qt/debugger/graphics/graphics_cmdlists.cpp
index 6711644e6..aaf733a7d 100644
--- a/src/citra_qt/debugger/graphics/graphics_cmdlists.cpp
+++ b/src/citra_qt/debugger/graphics/graphics_cmdlists.cpp
@@ -16,6 +16,7 @@
 #include "citra_qt/debugger/graphics/graphics_cmdlists.h"
 #include "citra_qt/util/util.h"
 #include "common/vector_math.h"
+#include "core/core.h"
 #include "core/memory.h"
 #include "video_core/debug_utils/debug_utils.h"
 #include "video_core/pica_state.h"
@@ -166,7 +167,7 @@ void GPUCommandListWidget::SetCommandInfo(const QModelIndex& index) {
         const auto format = texture.format;
 
         const auto info = Pica::Texture::TextureInfo::FromPicaRegister(config, format);
-        const u8* src = memory.GetPhysicalPointer(config.GetPhysicalAddress());
+        const u8* src = system.Memory().GetPhysicalPointer(config.GetPhysicalAddress());
         new_info_widget = new TextureInfoWidget(src, info);
     }
     if (command_info_widget) {
@@ -180,8 +181,8 @@ void GPUCommandListWidget::SetCommandInfo(const QModelIndex& index) {
 }
 #undef COMMAND_IN_RANGE
 
-GPUCommandListWidget::GPUCommandListWidget(Memory::MemorySystem& memory_, QWidget* parent)
-    : QDockWidget(tr("Pica Command List"), parent), memory{memory_} {
+GPUCommandListWidget::GPUCommandListWidget(Core::System& system_, QWidget* parent)
+    : QDockWidget(tr("Pica Command List"), parent), system{system_} {
     setObjectName(QStringLiteral("Pica Command List"));
     GPUCommandListModel* model = new GPUCommandListModel(this);
 
diff --git a/src/citra_qt/debugger/graphics/graphics_cmdlists.h b/src/citra_qt/debugger/graphics/graphics_cmdlists.h
index 5ea4d125b..4bd562a48 100644
--- a/src/citra_qt/debugger/graphics/graphics_cmdlists.h
+++ b/src/citra_qt/debugger/graphics/graphics_cmdlists.h
@@ -11,8 +11,8 @@
 class QPushButton;
 class QTreeView;
 
-namespace Memory {
-class MemorySystem;
+namespace Core {
+class System;
 }
 
 class GPUCommandListModel : public QAbstractListModel {
@@ -42,7 +42,7 @@ class GPUCommandListWidget : public QDockWidget {
     Q_OBJECT
 
 public:
-    explicit GPUCommandListWidget(Memory::MemorySystem& memory, QWidget* parent = nullptr);
+    explicit GPUCommandListWidget(Core::System& system, QWidget* parent = nullptr);
 
 public slots:
     void OnToggleTracing();
@@ -57,7 +57,7 @@ signals:
 
 private:
     std::unique_ptr<Pica::DebugUtils::PicaTrace> pica_trace;
-    Memory::MemorySystem& memory;
+    Core::System& system;
     QTreeView* list_widget;
     QWidget* command_info_widget;
     QPushButton* toggle_tracing;
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index b447af323..53b67f9f9 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -448,7 +448,7 @@ void GMainWindow::InitializeDebugWidgets() {
     graphicsWidget->hide();
     debug_menu->addAction(graphicsWidget->toggleViewAction());
 
-    graphicsCommandsWidget = new GPUCommandListWidget(system.Memory(), this);
+    graphicsCommandsWidget = new GPUCommandListWidget(system, this);
     addDockWidget(Qt::RightDockWidgetArea, graphicsCommandsWidget);
     graphicsCommandsWidget->hide();
     debug_menu->addAction(graphicsCommandsWidget->toggleViewAction());