summaryrefslogtreecommitdiff
path: root/src/citra_qt/main.cpp
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2015-02-05 14:53:25 -0200
committerGravatar Yuri Kunde Schlesner2015-03-01 21:47:13 -0300
commitcd1fbfcf1b70e365d81480ec0f56db19ed02454f (patch)
treeb220b105d1b8016bb258047683bf2d03795c8881 /src/citra_qt/main.cpp
parentMerge pull request #616 from archshift/5551 (diff)
downloadyuzu-cd1fbfcf1b70e365d81480ec0f56db19ed02454f.tar.gz
yuzu-cd1fbfcf1b70e365d81480ec0f56db19ed02454f.tar.xz
yuzu-cd1fbfcf1b70e365d81480ec0f56db19ed02454f.zip
Add profiling infrastructure and widget
Diffstat (limited to 'src/citra_qt/main.cpp')
-rw-r--r--src/citra_qt/main.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 881c7d337..e3db3c20a 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -35,6 +35,7 @@
35#include "debugger/graphics_cmdlists.h" 35#include "debugger/graphics_cmdlists.h"
36#include "debugger/graphics_framebuffer.h" 36#include "debugger/graphics_framebuffer.h"
37#include "debugger/graphics_vertex_shader.h" 37#include "debugger/graphics_vertex_shader.h"
38#include "debugger/profiler.h"
38 39
39#include "core/settings.h" 40#include "core/settings.h"
40#include "core/system.h" 41#include "core/system.h"
@@ -57,6 +58,10 @@ GMainWindow::GMainWindow()
57 render_window = new GRenderWindow; 58 render_window = new GRenderWindow;
58 render_window->hide(); 59 render_window->hide();
59 60
61 profilerWidget = new ProfilerWidget(this);
62 addDockWidget(Qt::BottomDockWidgetArea, profilerWidget);
63 profilerWidget->hide();
64
60 disasmWidget = new DisassemblerWidget(this, render_window->GetEmuThread()); 65 disasmWidget = new DisassemblerWidget(this, render_window->GetEmuThread());
61 addDockWidget(Qt::BottomDockWidgetArea, disasmWidget); 66 addDockWidget(Qt::BottomDockWidgetArea, disasmWidget);
62 disasmWidget->hide(); 67 disasmWidget->hide();
@@ -90,6 +95,7 @@ GMainWindow::GMainWindow()
90 graphicsVertexShaderWidget->hide(); 95 graphicsVertexShaderWidget->hide();
91 96
92 QMenu* debug_menu = ui.menu_View->addMenu(tr("Debugging")); 97 QMenu* debug_menu = ui.menu_View->addMenu(tr("Debugging"));
98 debug_menu->addAction(profilerWidget->toggleViewAction());
93 debug_menu->addAction(disasmWidget->toggleViewAction()); 99 debug_menu->addAction(disasmWidget->toggleViewAction());
94 debug_menu->addAction(registersWidget->toggleViewAction()); 100 debug_menu->addAction(registersWidget->toggleViewAction());
95 debug_menu->addAction(callstackWidget->toggleViewAction()); 101 debug_menu->addAction(callstackWidget->toggleViewAction());