summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-10-24 23:37:18 +0200
committerGitHub <noreply@github.com>2018-10-24 23:37:18 +0200
commitb723390ab1df2047acb9ebb10bb7b34c34b827d0 (patch)
tree789d93dafdef97a039e764626f7fc3059dcb8f9d
parentMerge pull request #1564 from lioncash/npad (diff)
parentgraphic_breakpoints: Correct translation of strings in BreakpointModel's data() function (diff)
downloadyuzu-b723390ab1df2047acb9ebb10bb7b34c34b827d0.tar
yuzu-b723390ab1df2047acb9ebb10bb7b34c34b827d0.tar.gz
yuzu-b723390ab1df2047acb9ebb10bb7b34c34b827d0.tar.bz2
yuzu-b723390ab1df2047acb9ebb10bb7b34c34b827d0.tar.lz
yuzu-b723390ab1df2047acb9ebb10bb7b34c34b827d0.tar.xz
yuzu-b723390ab1df2047acb9ebb10bb7b34c34b827d0.tar.zst
yuzu-b723390ab1df2047acb9ebb10bb7b34c34b827d0.zip
-rw-r--r--src/yuzu/debugger/graphics/graphics_breakpoints.cpp33
-rw-r--r--src/yuzu/debugger/graphics/graphics_breakpoints_p.h2
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;