diff options
| author | Subv <subv2112@gmail.com> | 2018-03-24 23:35:06 -0500 |
|---|---|---|
| committer | Subv <subv2112@gmail.com> | 2018-03-24 23:35:06 -0500 |
| commit | 0ce52b1da2228f3325d94e52bead7335c8b07d1c (patch) | |
| tree | db027be43dcb9fecb99fc7f8e698d3affd7e28c2 /src/yuzu/main.cpp | |
| parent | 2c785bd06c8f979fbb869d533204b29d93973d83 (diff) | |
GPU: Make the debug_context variable a member of the frontend instead of a global.
Diffstat (limited to 'src/yuzu/main.cpp')
| -rw-r--r-- | src/yuzu/main.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index b8c23ae156..bd323870b7 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -25,6 +25,7 @@ #include "core/gdbstub/gdbstub.h" #include "core/loader/loader.h" #include "core/settings.h" +#include "video_core/debug_utils/debug_utils.h" #include "yuzu/about_dialog.h" #include "yuzu/bootmanager.h" #include "yuzu/configuration/config.h" @@ -71,7 +72,7 @@ void GMainWindow::ShowCallouts() {} GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) { - Tegra::g_debug_context = Tegra::DebugContext::Construct(); + debug_context = Tegra::DebugContext::Construct(); setAcceptDrops(true); ui.setupUi(this); @@ -165,12 +166,12 @@ void GMainWindow::InitializeDebugWidgets() { connect(this, &GMainWindow::EmulationStopping, registersWidget, &RegistersWidget::OnEmulationStopping); - graphicsBreakpointsWidget = new GraphicsBreakPointsWidget(Tegra::g_debug_context, this); + graphicsBreakpointsWidget = new GraphicsBreakPointsWidget(debug_context, this); addDockWidget(Qt::RightDockWidgetArea, graphicsBreakpointsWidget); graphicsBreakpointsWidget->hide(); debug_menu->addAction(graphicsBreakpointsWidget->toggleViewAction()); - graphicsSurfaceWidget = new GraphicsSurfaceWidget(Tegra::g_debug_context, this); + graphicsSurfaceWidget = new GraphicsSurfaceWidget(debug_context, this); addDockWidget(Qt::RightDockWidgetArea, graphicsSurfaceWidget); graphicsSurfaceWidget->hide(); debug_menu->addAction(graphicsSurfaceWidget->toggleViewAction()); @@ -339,6 +340,8 @@ bool GMainWindow::LoadROM(const QString& filename) { Core::System& system{Core::System::GetInstance()}; + system.SetGPUDebugContext(debug_context); + const Core::System::ResultStatus result{system.Load(render_window, filename.toStdString())}; Core::Telemetry().AddField(Telemetry::FieldType::App, "Frontend", "Qt"); |