summaryrefslogtreecommitdiffstats
path: root/src/citra_qt/main.cpp
diff options
context:
space:
mode:
authorJannik Vogel <email@jannikvogel.de>2016-04-09 18:23:15 +0200
committerJannik Vogel <email@jannikvogel.de>2016-05-07 11:30:47 +0200
commit7d7849d71ade8585381abe9cbdc54ed3492979f0 (patch)
tree58d0c789eedd40f47ce845b3bf3e6e63684cdcb0 /src/citra_qt/main.cpp
parentMerge pull request #1762 from bunnei/global (diff)
downloadyuzu-7d7849d71ade8585381abe9cbdc54ed3492979f0.tar
yuzu-7d7849d71ade8585381abe9cbdc54ed3492979f0.tar.gz
yuzu-7d7849d71ade8585381abe9cbdc54ed3492979f0.tar.bz2
yuzu-7d7849d71ade8585381abe9cbdc54ed3492979f0.tar.lz
yuzu-7d7849d71ade8585381abe9cbdc54ed3492979f0.tar.xz
yuzu-7d7849d71ade8585381abe9cbdc54ed3492979f0.tar.zst
yuzu-7d7849d71ade8585381abe9cbdc54ed3492979f0.zip
Diffstat (limited to '')
-rw-r--r--src/citra_qt/main.cpp19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index f1ab29755..dfc7c0752 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -26,7 +26,7 @@
#include "citra_qt/debugger/graphics.h"
#include "citra_qt/debugger/graphics_breakpoints.h"
#include "citra_qt/debugger/graphics_cmdlists.h"
-#include "citra_qt/debugger/graphics_framebuffer.h"
+#include "citra_qt/debugger/graphics_surface.h"
#include "citra_qt/debugger/graphics_tracing.h"
#include "citra_qt/debugger/graphics_vertex_shader.h"
#include "citra_qt/debugger/profiler.h"
@@ -98,10 +98,6 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr)
addDockWidget(Qt::RightDockWidgetArea, graphicsBreakpointsWidget);
graphicsBreakpointsWidget->hide();
- auto graphicsFramebufferWidget = new GraphicsFramebufferWidget(Pica::g_debug_context, this);
- addDockWidget(Qt::RightDockWidgetArea, graphicsFramebufferWidget);
- graphicsFramebufferWidget->hide();
-
auto graphicsVertexShaderWidget = new GraphicsVertexShaderWidget(Pica::g_debug_context, this);
addDockWidget(Qt::RightDockWidgetArea, graphicsVertexShaderWidget);
graphicsVertexShaderWidget->hide();
@@ -110,7 +106,12 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr)
addDockWidget(Qt::RightDockWidgetArea, graphicsTracingWidget);
graphicsTracingWidget->hide();
+ auto graphicsSurfaceViewerAction = new QAction(tr("Create Pica surface viewer"), this);
+ connect(graphicsSurfaceViewerAction, SIGNAL(triggered()), this, SLOT(OnCreateGraphicsSurfaceViewer()));
+
QMenu* debug_menu = ui.menu_View->addMenu(tr("Debugging"));
+ debug_menu->addAction(graphicsSurfaceViewerAction);
+ debug_menu->addSeparator();
debug_menu->addAction(profilerWidget->toggleViewAction());
#if MICROPROFILE_ENABLED
debug_menu->addAction(microProfileDialog->toggleViewAction());
@@ -121,7 +122,6 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr)
debug_menu->addAction(graphicsWidget->toggleViewAction());
debug_menu->addAction(graphicsCommandsWidget->toggleViewAction());
debug_menu->addAction(graphicsBreakpointsWidget->toggleViewAction());
- debug_menu->addAction(graphicsFramebufferWidget->toggleViewAction());
debug_menu->addAction(graphicsVertexShaderWidget->toggleViewAction());
debug_menu->addAction(graphicsTracingWidget->toggleViewAction());
@@ -498,6 +498,13 @@ void GMainWindow::OnConfigure() {
}
}
+void GMainWindow::OnCreateGraphicsSurfaceViewer() {
+ auto graphicsSurfaceViewerWidget = new GraphicsSurfaceWidget(Pica::g_debug_context, this);
+ addDockWidget(Qt::RightDockWidgetArea, graphicsSurfaceViewerWidget);
+ // TODO: Maybe graphicsSurfaceViewerWidget->setFloating(true);
+ graphicsSurfaceViewerWidget->show();
+}
+
bool GMainWindow::ConfirmClose() {
if (emu_thread == nullptr || !UISettings::values.confirm_before_closing)
return true;