summaryrefslogtreecommitdiff
path: root/src/citra_qt/main.cpp
diff options
context:
space:
mode:
authorGravatar Jannik Vogel2016-04-09 18:23:15 +0200
committerGravatar Jannik Vogel2016-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.gz
yuzu-7d7849d71ade8585381abe9cbdc54ed3492979f0.tar.xz
yuzu-7d7849d71ade8585381abe9cbdc54ed3492979f0.zip
citra_qt: Replace 'Pica Framebuffer Debugger' with 'Pica Surface Viewer'
Diffstat (limited to 'src/citra_qt/main.cpp')
-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 @@
26#include "citra_qt/debugger/graphics.h" 26#include "citra_qt/debugger/graphics.h"
27#include "citra_qt/debugger/graphics_breakpoints.h" 27#include "citra_qt/debugger/graphics_breakpoints.h"
28#include "citra_qt/debugger/graphics_cmdlists.h" 28#include "citra_qt/debugger/graphics_cmdlists.h"
29#include "citra_qt/debugger/graphics_framebuffer.h" 29#include "citra_qt/debugger/graphics_surface.h"
30#include "citra_qt/debugger/graphics_tracing.h" 30#include "citra_qt/debugger/graphics_tracing.h"
31#include "citra_qt/debugger/graphics_vertex_shader.h" 31#include "citra_qt/debugger/graphics_vertex_shader.h"
32#include "citra_qt/debugger/profiler.h" 32#include "citra_qt/debugger/profiler.h"
@@ -98,10 +98,6 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr)
98 addDockWidget(Qt::RightDockWidgetArea, graphicsBreakpointsWidget); 98 addDockWidget(Qt::RightDockWidgetArea, graphicsBreakpointsWidget);
99 graphicsBreakpointsWidget->hide(); 99 graphicsBreakpointsWidget->hide();
100 100
101 auto graphicsFramebufferWidget = new GraphicsFramebufferWidget(Pica::g_debug_context, this);
102 addDockWidget(Qt::RightDockWidgetArea, graphicsFramebufferWidget);
103 graphicsFramebufferWidget->hide();
104
105 auto graphicsVertexShaderWidget = new GraphicsVertexShaderWidget(Pica::g_debug_context, this); 101 auto graphicsVertexShaderWidget = new GraphicsVertexShaderWidget(Pica::g_debug_context, this);
106 addDockWidget(Qt::RightDockWidgetArea, graphicsVertexShaderWidget); 102 addDockWidget(Qt::RightDockWidgetArea, graphicsVertexShaderWidget);
107 graphicsVertexShaderWidget->hide(); 103 graphicsVertexShaderWidget->hide();
@@ -110,7 +106,12 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr)
110 addDockWidget(Qt::RightDockWidgetArea, graphicsTracingWidget); 106 addDockWidget(Qt::RightDockWidgetArea, graphicsTracingWidget);
111 graphicsTracingWidget->hide(); 107 graphicsTracingWidget->hide();
112 108
109 auto graphicsSurfaceViewerAction = new QAction(tr("Create Pica surface viewer"), this);
110 connect(graphicsSurfaceViewerAction, SIGNAL(triggered()), this, SLOT(OnCreateGraphicsSurfaceViewer()));
111
113 QMenu* debug_menu = ui.menu_View->addMenu(tr("Debugging")); 112 QMenu* debug_menu = ui.menu_View->addMenu(tr("Debugging"));
113 debug_menu->addAction(graphicsSurfaceViewerAction);
114 debug_menu->addSeparator();
114 debug_menu->addAction(profilerWidget->toggleViewAction()); 115 debug_menu->addAction(profilerWidget->toggleViewAction());
115#if MICROPROFILE_ENABLED 116#if MICROPROFILE_ENABLED
116 debug_menu->addAction(microProfileDialog->toggleViewAction()); 117 debug_menu->addAction(microProfileDialog->toggleViewAction());
@@ -121,7 +122,6 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr)
121 debug_menu->addAction(graphicsWidget->toggleViewAction()); 122 debug_menu->addAction(graphicsWidget->toggleViewAction());
122 debug_menu->addAction(graphicsCommandsWidget->toggleViewAction()); 123 debug_menu->addAction(graphicsCommandsWidget->toggleViewAction());
123 debug_menu->addAction(graphicsBreakpointsWidget->toggleViewAction()); 124 debug_menu->addAction(graphicsBreakpointsWidget->toggleViewAction());
124 debug_menu->addAction(graphicsFramebufferWidget->toggleViewAction());
125 debug_menu->addAction(graphicsVertexShaderWidget->toggleViewAction()); 125 debug_menu->addAction(graphicsVertexShaderWidget->toggleViewAction());
126 debug_menu->addAction(graphicsTracingWidget->toggleViewAction()); 126 debug_menu->addAction(graphicsTracingWidget->toggleViewAction());
127 127
@@ -498,6 +498,13 @@ void GMainWindow::OnConfigure() {
498 } 498 }
499} 499}
500 500
501void GMainWindow::OnCreateGraphicsSurfaceViewer() {
502 auto graphicsSurfaceViewerWidget = new GraphicsSurfaceWidget(Pica::g_debug_context, this);
503 addDockWidget(Qt::RightDockWidgetArea, graphicsSurfaceViewerWidget);
504 // TODO: Maybe graphicsSurfaceViewerWidget->setFloating(true);
505 graphicsSurfaceViewerWidget->show();
506}
507
501bool GMainWindow::ConfirmClose() { 508bool GMainWindow::ConfirmClose() {
502 if (emu_thread == nullptr || !UISettings::values.confirm_before_closing) 509 if (emu_thread == nullptr || !UISettings::values.confirm_before_closing)
503 return true; 510 return true;