Browse Source

Merge pull request #2362 from lioncash/graphics

citra-qt: Move graphics debugging code into its own folder
nce_cpp
bunnei 9 years ago
committed by GitHub
parent
commit
3346caa87a
  1. 30
      src/citra_qt/CMakeLists.txt
  2. 2
      src/citra_qt/debugger/graphics/graphics.cpp
  3. 0
      src/citra_qt/debugger/graphics/graphics.h
  4. 2
      src/citra_qt/debugger/graphics/graphics_breakpoint_observer.cpp
  5. 0
      src/citra_qt/debugger/graphics/graphics_breakpoint_observer.h
  6. 4
      src/citra_qt/debugger/graphics/graphics_breakpoints.cpp
  7. 0
      src/citra_qt/debugger/graphics/graphics_breakpoints.h
  8. 0
      src/citra_qt/debugger/graphics/graphics_breakpoints_p.h
  9. 2
      src/citra_qt/debugger/graphics/graphics_cmdlists.cpp
  10. 0
      src/citra_qt/debugger/graphics/graphics_cmdlists.h
  11. 2
      src/citra_qt/debugger/graphics/graphics_surface.cpp
  12. 2
      src/citra_qt/debugger/graphics/graphics_surface.h
  13. 2
      src/citra_qt/debugger/graphics/graphics_tracing.cpp
  14. 2
      src/citra_qt/debugger/graphics/graphics_tracing.h
  15. 2
      src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp
  16. 2
      src/citra_qt/debugger/graphics/graphics_vertex_shader.h
  17. 12
      src/citra_qt/main.cpp

30
src/citra_qt/CMakeLists.txt

@ -6,13 +6,13 @@ set(SRCS
config.cpp
debugger/callstack.cpp
debugger/disassembler.cpp
debugger/graphics.cpp
debugger/graphics_breakpoint_observer.cpp
debugger/graphics_breakpoints.cpp
debugger/graphics_cmdlists.cpp
debugger/graphics_surface.cpp
debugger/graphics_tracing.cpp
debugger/graphics_vertex_shader.cpp
debugger/graphics/graphics.cpp
debugger/graphics/graphics_breakpoint_observer.cpp
debugger/graphics/graphics_breakpoints.cpp
debugger/graphics/graphics_cmdlists.cpp
debugger/graphics/graphics_surface.cpp
debugger/graphics/graphics_tracing.cpp
debugger/graphics/graphics_vertex_shader.cpp
debugger/profiler.cpp
debugger/ramview.cpp
debugger/registers.cpp
@ -39,14 +39,14 @@ set(HEADERS
config.h
debugger/callstack.h
debugger/disassembler.h
debugger/graphics.h
debugger/graphics_breakpoint_observer.h
debugger/graphics_breakpoints.h
debugger/graphics_breakpoints_p.h
debugger/graphics_cmdlists.h
debugger/graphics_surface.h
debugger/graphics_tracing.h
debugger/graphics_vertex_shader.h
debugger/graphics/graphics.h
debugger/graphics/graphics_breakpoint_observer.h
debugger/graphics/graphics_breakpoints.h
debugger/graphics/graphics_breakpoints_p.h
debugger/graphics/graphics_cmdlists.h
debugger/graphics/graphics_surface.h
debugger/graphics/graphics_tracing.h
debugger/graphics/graphics_vertex_shader.h
debugger/profiler.h
debugger/ramview.h
debugger/registers.h

2
src/citra_qt/debugger/graphics.cpp → src/citra_qt/debugger/graphics/graphics.cpp

@ -3,7 +3,7 @@
// Refer to the license.txt file included.
#include <QListView>
#include "citra_qt/debugger/graphics.h"
#include "citra_qt/debugger/graphics/graphics.h"
#include "citra_qt/util/util.h"
extern GraphicsDebugger g_debugger;

0
src/citra_qt/debugger/graphics.h → src/citra_qt/debugger/graphics/graphics.h

2
src/citra_qt/debugger/graphics_breakpoint_observer.cpp → src/citra_qt/debugger/graphics/graphics_breakpoint_observer.cpp

@ -3,7 +3,7 @@
// Refer to the license.txt file included.
#include <QMetaType>
#include "citra_qt/debugger/graphics_breakpoint_observer.h"
#include "citra_qt/debugger/graphics/graphics_breakpoint_observer.h"
BreakPointObserverDock::BreakPointObserverDock(std::shared_ptr<Pica::DebugContext> debug_context,
const QString& title, QWidget* parent)

0
src/citra_qt/debugger/graphics_breakpoint_observer.h → src/citra_qt/debugger/graphics/graphics_breakpoint_observer.h

4
src/citra_qt/debugger/graphics_breakpoints.cpp → src/citra_qt/debugger/graphics/graphics_breakpoints.cpp

@ -7,8 +7,8 @@
#include <QPushButton>
#include <QTreeView>
#include <QVBoxLayout>
#include "citra_qt/debugger/graphics_breakpoints.h"
#include "citra_qt/debugger/graphics_breakpoints_p.h"
#include "citra_qt/debugger/graphics/graphics_breakpoints.h"
#include "citra_qt/debugger/graphics/graphics_breakpoints_p.h"
#include "common/assert.h"
BreakPointModel::BreakPointModel(std::shared_ptr<Pica::DebugContext> debug_context, QObject* parent)

0
src/citra_qt/debugger/graphics_breakpoints.h → src/citra_qt/debugger/graphics/graphics_breakpoints.h

0
src/citra_qt/debugger/graphics_breakpoints_p.h → src/citra_qt/debugger/graphics/graphics_breakpoints_p.h

2
src/citra_qt/debugger/graphics_cmdlists.cpp → src/citra_qt/debugger/graphics/graphics_cmdlists.cpp

@ -13,7 +13,7 @@
#include <QSpinBox>
#include <QTreeView>
#include <QVBoxLayout>
#include "citra_qt/debugger/graphics_cmdlists.h"
#include "citra_qt/debugger/graphics/graphics_cmdlists.h"
#include "citra_qt/util/spinbox.h"
#include "citra_qt/util/util.h"
#include "common/vector_math.h"

0
src/citra_qt/debugger/graphics_cmdlists.h → src/citra_qt/debugger/graphics/graphics_cmdlists.h

2
src/citra_qt/debugger/graphics_surface.cpp → src/citra_qt/debugger/graphics/graphics_surface.cpp

@ -11,7 +11,7 @@
#include <QPushButton>
#include <QScrollArea>
#include <QSpinBox>
#include "citra_qt/debugger/graphics_surface.h"
#include "citra_qt/debugger/graphics/graphics_surface.h"
#include "citra_qt/util/spinbox.h"
#include "common/color.h"
#include "core/hw/gpu.h"

2
src/citra_qt/debugger/graphics_surface.h → src/citra_qt/debugger/graphics/graphics_surface.h

@ -6,7 +6,7 @@
#include <QLabel>
#include <QPushButton>
#include "citra_qt/debugger/graphics_breakpoint_observer.h"
#include "citra_qt/debugger/graphics/graphics_breakpoint_observer.h"
class QComboBox;
class QSpinBox;

2
src/citra_qt/debugger/graphics_tracing.cpp → src/citra_qt/debugger/graphics/graphics_tracing.cpp

@ -12,7 +12,7 @@
#include <QMessageBox>
#include <QPushButton>
#include <boost/range/algorithm/copy.hpp>
#include "citra_qt/debugger/graphics_tracing.h"
#include "citra_qt/debugger/graphics/graphics_tracing.h"
#include "common/common_types.h"
#include "core/hw/gpu.h"
#include "core/hw/lcd.h"

2
src/citra_qt/debugger/graphics_tracing.h → src/citra_qt/debugger/graphics/graphics_tracing.h

@ -4,7 +4,7 @@
#pragma once
#include "citra_qt/debugger/graphics_breakpoint_observer.h"
#include "citra_qt/debugger/graphics/graphics_breakpoint_observer.h"
class EmuThread;

2
src/citra_qt/debugger/graphics_vertex_shader.cpp → src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp

@ -14,7 +14,7 @@
#include <QSignalMapper>
#include <QSpinBox>
#include <QTreeView>
#include "citra_qt/debugger/graphics_vertex_shader.h"
#include "citra_qt/debugger/graphics/graphics_vertex_shader.h"
#include "citra_qt/util/util.h"
#include "video_core/pica.h"
#include "video_core/pica_state.h"

2
src/citra_qt/debugger/graphics_vertex_shader.h → src/citra_qt/debugger/graphics/graphics_vertex_shader.h

@ -6,7 +6,7 @@
#include <QAbstractTableModel>
#include <QTreeView>
#include "citra_qt/debugger/graphics_breakpoint_observer.h"
#include "citra_qt/debugger/graphics/graphics_breakpoint_observer.h"
#include "nihstro/parser_shbin.h"
#include "video_core/shader/shader.h"

12
src/citra_qt/main.cpp

@ -17,12 +17,12 @@
#include "citra_qt/configure_dialog.h"
#include "citra_qt/debugger/callstack.h"
#include "citra_qt/debugger/disassembler.h"
#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_surface.h"
#include "citra_qt/debugger/graphics_tracing.h"
#include "citra_qt/debugger/graphics_vertex_shader.h"
#include "citra_qt/debugger/graphics/graphics.h"
#include "citra_qt/debugger/graphics/graphics_breakpoints.h"
#include "citra_qt/debugger/graphics/graphics_cmdlists.h"
#include "citra_qt/debugger/graphics/graphics_surface.h"
#include "citra_qt/debugger/graphics/graphics_tracing.h"
#include "citra_qt/debugger/graphics/graphics_vertex_shader.h"
#include "citra_qt/debugger/profiler.h"
#include "citra_qt/debugger/ramview.h"
#include "citra_qt/debugger/registers.h"

Loading…
Cancel
Save