summaryrefslogtreecommitdiffstats
path: root/src/citra_qt
diff options
context:
space:
mode:
authorTony Wasserka <NeoBrainX@gmail.com>2014-05-18 19:59:36 +0200
committerbunnei <ericbunnie@gmail.com>2014-06-12 12:10:52 +0200
commitb0051b2203d8319e57603ee6cbfaa5cd798de060 (patch)
tree8d331f1958fbf0dda7215e597faff818a7bda247 /src/citra_qt
parentcitra-qt: Add command list view. (diff)
downloadyuzu-b0051b2203d8319e57603ee6cbfaa5cd798de060.tar
yuzu-b0051b2203d8319e57603ee6cbfaa5cd798de060.tar.gz
yuzu-b0051b2203d8319e57603ee6cbfaa5cd798de060.tar.bz2
yuzu-b0051b2203d8319e57603ee6cbfaa5cd798de060.tar.lz
yuzu-b0051b2203d8319e57603ee6cbfaa5cd798de060.tar.xz
yuzu-b0051b2203d8319e57603ee6cbfaa5cd798de060.tar.zst
yuzu-b0051b2203d8319e57603ee6cbfaa5cd798de060.zip
Diffstat (limited to 'src/citra_qt')
-rw-r--r--src/citra_qt/debugger/graphics_cmdlists.cpp98
-rw-r--r--src/citra_qt/debugger/graphics_cmdlists.hxx28
2 files changed, 107 insertions, 19 deletions
diff --git a/src/citra_qt/debugger/graphics_cmdlists.cpp b/src/citra_qt/debugger/graphics_cmdlists.cpp
index 576882e8a..d07645e78 100644
--- a/src/citra_qt/debugger/graphics_cmdlists.cpp
+++ b/src/citra_qt/debugger/graphics_cmdlists.cpp
@@ -3,18 +3,57 @@
// Refer to the license.txt file included.
#include "graphics_cmdlists.hxx"
-#include <QListView>
+#include <QTreeView>
extern GraphicsDebugger g_debugger;
-GPUCommandListModel::GPUCommandListModel(QObject* parent) : QAbstractListModel(parent), row_count(0)
+GPUCommandListModel::GPUCommandListModel(QObject* parent) : QAbstractItemModel(parent)
{
+ root_item = new TreeItem(TreeItem::ROOT, 0, NULL, this);
+
connect(this, SIGNAL(CommandListCalled()), this, SLOT(OnCommandListCalledInternal()), Qt::UniqueConnection);
}
+QModelIndex GPUCommandListModel::index(int row, int column, const QModelIndex& parent) const
+{
+ TreeItem* item;
+
+ if (!parent.isValid()) {
+ item = root_item;
+ } else {
+ item = (TreeItem*)parent.internalPointer();
+ }
+
+ return createIndex(row, column, item->children[row]);
+}
+
+QModelIndex GPUCommandListModel::parent(const QModelIndex& child) const
+{
+ if (!child.isValid())
+ return QModelIndex();
+
+ TreeItem* item = (TreeItem*)child.internalPointer();
+
+ if (item->parent == NULL)
+ return QModelIndex();
+
+ return createIndex(item->parent->index, 0, item->parent);
+}
+
int GPUCommandListModel::rowCount(const QModelIndex& parent) const
{
- return row_count;
+ TreeItem* item;
+ if (!parent.isValid()) {
+ item = root_item;
+ } else {
+ item = (TreeItem*)parent.internalPointer();
+ }
+ return item->children.size();
+}
+
+int GPUCommandListModel::columnCount(const QModelIndex& parent) const
+{
+ return 1;
}
QVariant GPUCommandListModel::data(const QModelIndex& index, int role) const
@@ -22,19 +61,33 @@ QVariant GPUCommandListModel::data(const QModelIndex& index, int role) const
if (!index.isValid())
return QVariant();
- int idx = index.row();
- if (role == Qt::DisplayRole)
+ const TreeItem* item = (const TreeItem*)index.internalPointer();
+
+ if (item->type == TreeItem::COMMAND_LIST)
{
- QString content;
- const GraphicsDebugger::PicaCommandList& cmdlist = command_list[idx].second;
- for (int i = 0; i < cmdlist.size(); ++i)
+ const GraphicsDebugger::PicaCommandList& cmdlist = command_lists[item->index].second;
+ u32 address = command_lists[item->index].first;
+
+ if (role == Qt::DisplayRole)
{
- const GraphicsDebugger::PicaCommand& cmd = cmdlist[i];
+ return QVariant(QString("0x%1 bytes at 0x%2").arg(cmdlist.size(), 0, 16).arg(address, 8, 16, QLatin1Char('0')));
+ }
+ }
+ else
+ {
+ // index refers to a specific command
+ const GraphicsDebugger::PicaCommandList& cmdlist = command_lists[item->parent->index].second;
+ const GraphicsDebugger::PicaCommand& cmd = cmdlist[item->index];
+
+ if (role == Qt::DisplayRole) {
+ QString content;
for (int j = 0; j < cmd.size(); ++j)
content.append(QString("%1 ").arg(cmd[j], 8, 16, QLatin1Char('0')));
+
+ return QVariant(content);
}
- return QVariant(content);
}
+
return QVariant();
}
@@ -48,8 +101,22 @@ void GPUCommandListModel::OnCommandListCalledInternal()
{
beginResetModel();
- command_list = GetDebugger()->GetCommandLists();
- row_count = command_list.size();
+ command_lists = GetDebugger()->GetCommandLists();
+
+ // delete root item and rebuild tree
+ delete root_item;
+ root_item = new TreeItem(TreeItem::ROOT, 0, NULL, this);
+
+ for (int command_list_idx = 0; command_list_idx < command_lists.size(); ++command_list_idx) {
+ TreeItem* command_list_item = new TreeItem(TreeItem::COMMAND_LIST, command_list_idx, root_item, root_item);
+ root_item->children.push_back(command_list_item);
+
+ const GraphicsDebugger::PicaCommandList& command_list = command_lists[command_list_idx].second;
+ for (int command_idx = 0; command_idx < command_list.size(); ++command_idx) {
+ TreeItem* command_item = new TreeItem(TreeItem::COMMAND, command_idx, command_list_item, command_list_item);
+ command_list_item->children.push_back(command_item);
+ }
+ }
endResetModel();
}
@@ -59,7 +126,8 @@ GPUCommandListWidget::GPUCommandListWidget(QWidget* parent) : QDockWidget(tr("Pi
GPUCommandListModel* model = new GPUCommandListModel(this);
g_debugger.RegisterObserver(model);
- QListView* list_widget = new QListView;
- list_widget->setModel(model);
- setWidget(list_widget);
+ QTreeView* tree_widget = new QTreeView;
+ tree_widget->setModel(model);
+ tree_widget->setFont(QFont("monospace"));
+ setWidget(tree_widget);
}
diff --git a/src/citra_qt/debugger/graphics_cmdlists.hxx b/src/citra_qt/debugger/graphics_cmdlists.hxx
index bac23c643..b4e6e3c8a 100644
--- a/src/citra_qt/debugger/graphics_cmdlists.hxx
+++ b/src/citra_qt/debugger/graphics_cmdlists.hxx
@@ -4,18 +4,22 @@
#pragma once
-#include <QAbstractListModel>
+#include <QAbstractItemModel>
#include <QDockWidget>
#include "video_core/gpu_debugger.h"
-class GPUCommandListModel : public QAbstractListModel, public GraphicsDebugger::DebuggerObserver
+// TODO: Rename class, since it's not actually a list model anymore...
+class GPUCommandListModel : public QAbstractItemModel, public GraphicsDebugger::DebuggerObserver
{
Q_OBJECT
public:
GPUCommandListModel(QObject* parent);
+ QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const;
+ QModelIndex parent(const QModelIndex& child) const;
+ int columnCount(const QModelIndex& parent = QModelIndex()) const;
int rowCount(const QModelIndex& parent = QModelIndex()) const override;
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
@@ -29,8 +33,24 @@ signals:
void CommandListCalled();
private:
- int row_count;
- std::vector<std::pair<u32,GraphicsDebugger::PicaCommandList>> command_list;
+ struct TreeItem : public QObject
+ {
+ enum Type {
+ ROOT,
+ COMMAND_LIST,
+ COMMAND
+ };
+
+ TreeItem(Type type, int index, TreeItem* item_parent, QObject* parent) : QObject(parent), type(type), index(index), parent(item_parent) {}
+
+ Type type;
+ int index;
+ std::vector<TreeItem*> children;
+ TreeItem* parent;
+ };
+
+ std::vector<std::pair<u32,GraphicsDebugger::PicaCommandList>> command_lists;
+ TreeItem* root_item;
};
class GPUCommandListWidget : public QDockWidget