1 files changed, 13 insertions, 6 deletions

diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 6239160bc..0ed1ffa5a 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -29,7 +29,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"
@@ -101,10 +101,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();
@@ -113,7 +109,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());
@@ -124,7 +125,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());
 
@@ -517,6 +517,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;