diff options
| -rw-r--r-- | src/yuzu/debugger/graphics/graphics_breakpoints.cpp | 33 | ||||
| -rw-r--r-- | src/yuzu/debugger/graphics/graphics_breakpoints_p.h | 2 | 
2 files changed, 20 insertions, 15 deletions
diff --git a/src/yuzu/debugger/graphics/graphics_breakpoints.cpp b/src/yuzu/debugger/graphics/graphics_breakpoints.cpp index b5c88f944..67ed0ba6d 100644 --- a/src/yuzu/debugger/graphics/graphics_breakpoints.cpp +++ b/src/yuzu/debugger/graphics/graphics_breakpoints.cpp @@ -2,7 +2,6 @@  // Licensed under GPLv2 or any later version  // Refer to the license.txt file included. -#include <map>  #include <QLabel>  #include <QMetaType>  #include <QPushButton> @@ -32,21 +31,8 @@ QVariant BreakPointModel::data(const QModelIndex& index, int role) const {      switch (role) {      case Qt::DisplayRole: {          if (index.column() == 0) { -            static const std::map<Tegra::DebugContext::Event, QString> map = { -                {Tegra::DebugContext::Event::MaxwellCommandLoaded, tr("Maxwell command loaded")}, -                {Tegra::DebugContext::Event::MaxwellCommandProcessed, -                 tr("Maxwell command processed")}, -                {Tegra::DebugContext::Event::IncomingPrimitiveBatch, -                 tr("Incoming primitive batch")}, -                {Tegra::DebugContext::Event::FinishedPrimitiveBatch, -                 tr("Finished primitive batch")}, -            }; - -            DEBUG_ASSERT(map.size() == -                         static_cast<std::size_t>(Tegra::DebugContext::Event::NumEvents)); -            return (map.find(event) != map.end()) ? map.at(event) : QString(); +            return DebugContextEventToString(event);          } -          break;      } @@ -128,6 +114,23 @@ void BreakPointModel::OnResumed() {      active_breakpoint = context->active_breakpoint;  } +QString BreakPointModel::DebugContextEventToString(Tegra::DebugContext::Event event) { +    switch (event) { +    case Tegra::DebugContext::Event::MaxwellCommandLoaded: +        return tr("Maxwell command loaded"); +    case Tegra::DebugContext::Event::MaxwellCommandProcessed: +        return tr("Maxwell command processed"); +    case Tegra::DebugContext::Event::IncomingPrimitiveBatch: +        return tr("Incoming primitive batch"); +    case Tegra::DebugContext::Event::FinishedPrimitiveBatch: +        return tr("Finished primitive batch"); +    case Tegra::DebugContext::Event::NumEvents: +        break; +    } + +    return tr("Unknown debug context event"); +} +  GraphicsBreakPointsWidget::GraphicsBreakPointsWidget(      std::shared_ptr<Tegra::DebugContext> debug_context, QWidget* parent)      : QDockWidget(tr("Maxwell Breakpoints"), parent), Tegra::DebugContext::BreakPointObserver( diff --git a/src/yuzu/debugger/graphics/graphics_breakpoints_p.h b/src/yuzu/debugger/graphics/graphics_breakpoints_p.h index 7112b87e6..fb488e38f 100644 --- a/src/yuzu/debugger/graphics/graphics_breakpoints_p.h +++ b/src/yuzu/debugger/graphics/graphics_breakpoints_p.h @@ -29,6 +29,8 @@ public:      void OnResumed();  private: +    static QString DebugContextEventToString(Tegra::DebugContext::Event event); +      std::weak_ptr<Tegra::DebugContext> context_weak;      bool at_breakpoint;      Tegra::DebugContext::Event active_breakpoint;  | 
