citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Shader Debugger: Fix freeze when double-clicking shader disassembly

This commit is contained in:
Yuri Kunde Schlesner 2015-08-19 05:51:12 -03:00
parent 2d195ba64e
commit c1beb2ce20
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/citra_qt/debugger/graphics_cmdlists.cpp
View File

@ -359,7 +359,7 @@ void GPUCommandListWidget::CopyAllToClipboard() {
QClipboard* clipboard = QApplication::clipboard(); QClipboard* clipboard = QApplication::clipboard();
QString text; QString text;
QAbstractItemModel* model = static_cast<QAbstractListModel*>(list_widget->model()); QAbstractItemModel* model = static_cast<QAbstractItemModel*>(list_widget->model());
for (int row = 0; row < model->rowCount({}); ++row) { for (int row = 0; row < model->rowCount({}); ++row) {
for (int col = 0; col < model->columnCount({}); ++col) { for (int col = 0; col < model->columnCount({}); ++col) {

10
src/citra_qt/debugger/graphics_vertex_shader.cpp
View File

@ -27,18 +27,10 @@ using nihstro::Instruction;
using nihstro::SourceRegister; using nihstro::SourceRegister;
using nihstro::SwizzlePattern; using nihstro::SwizzlePattern;
GraphicsVertexShaderModel::GraphicsVertexShaderModel(GraphicsVertexShaderWidget* parent): QAbstractItemModel(parent), par(parent) { GraphicsVertexShaderModel::GraphicsVertexShaderModel(GraphicsVertexShaderWidget* parent): QAbstractTableModel(parent), par(parent) {
} }
QModelIndex GraphicsVertexShaderModel::index(int row, int column, const QModelIndex& parent) const {
return createIndex(row, column);
}
QModelIndex GraphicsVertexShaderModel::parent(const QModelIndex& child) const {
return QModelIndex();
}
int GraphicsVertexShaderModel::columnCount(const QModelIndex& parent) const { int GraphicsVertexShaderModel::columnCount(const QModelIndex& parent) const {
return 3; return 3;
} }

6
src/citra_qt/debugger/graphics_vertex_shader.h
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include <QAbstractListModel> #include <QAbstractTableModel>
#include "graphics_breakpoint_observer.h" #include "graphics_breakpoint_observer.h"
@ -17,14 +17,12 @@ class QSpinBox;
class GraphicsVertexShaderWidget; class GraphicsVertexShaderWidget;
class GraphicsVertexShaderModel : public QAbstractItemModel { class GraphicsVertexShaderModel : public QAbstractTableModel {
Q_OBJECT Q_OBJECT
public: public:
GraphicsVertexShaderModel(GraphicsVertexShaderWidget* parent); GraphicsVertexShaderModel(GraphicsVertexShaderWidget* parent);
QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override;
QModelIndex parent(const QModelIndex& child) const override;
int columnCount(const QModelIndex& parent = QModelIndex()) const override; int columnCount(const QModelIndex& parent = QModelIndex()) const override;
int rowCount(const QModelIndex& parent = QModelIndex()) const override; int rowCount(const QModelIndex& parent = QModelIndex()) const override;
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;