summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/citra_qt/debugger/graphics_cmdlists.cpp173
-rw-r--r--src/citra_qt/debugger/graphics_cmdlists.hxx24
-rw-r--r--src/video_core/debug_utils/debug_utils.cpp12
-rw-r--r--src/video_core/debug_utils/debug_utils.h4
-rw-r--r--src/video_core/pica.h15
5 files changed, 209 insertions, 19 deletions
diff --git a/src/citra_qt/debugger/graphics_cmdlists.cpp b/src/citra_qt/debugger/graphics_cmdlists.cpp
index dcd0ced33..4f58e9a90 100644
--- a/src/citra_qt/debugger/graphics_cmdlists.cpp
+++ b/src/citra_qt/debugger/graphics_cmdlists.cpp
@@ -4,30 +4,39 @@
#include <QLabel>
#include <QListView>
+#include <QMainWindow>
#include <QPushButton>
#include <QVBoxLayout>
#include <QTreeView>
-
-#include "graphics_cmdlists.hxx"
+#include <QSpinBox>
+#include <QComboBox>
#include "video_core/pica.h"
#include "video_core/math.h"
#include "video_core/debug_utils/debug_utils.h"
+#include "graphics_cmdlists.hxx"
+
+#include "util/spinbox.hxx"
+
+QImage LoadTexture(u8* src, const Pica::DebugUtils::TextureInfo& info) {
+ QImage decoded_image(info.width, info.height, QImage::Format_ARGB32);
+ for (int y = 0; y < info.height; ++y) {
+ for (int x = 0; x < info.width; ++x) {
+ Math::Vec4<u8> color = Pica::DebugUtils::LookupTexture(src, x, y, info);
+ decoded_image.setPixel(x, y, qRgba(color.r(), color.g(), color.b(), color.a()));
+ }
+ }
+
+ return decoded_image;
+}
+
class TextureInfoWidget : public QWidget {
public:
TextureInfoWidget(u8* src, const Pica::DebugUtils::TextureInfo& info, QWidget* parent = nullptr) : QWidget(parent) {
- QImage decoded_image(info.width, info.height, QImage::Format_ARGB32);
- for (int y = 0; y < info.height; ++y) {
- for (int x = 0; x < info.width; ++x) {
- Math::Vec4<u8> color = Pica::DebugUtils::LookupTexture(src, x, y, info);
- decoded_image.setPixel(x, y, qRgba(color.r(), color.g(), color.b(), color.a()));
- }
- }
-
QLabel* image_widget = new QLabel;
- QPixmap image_pixmap = QPixmap::fromImage(decoded_image);
+ QPixmap image_pixmap = QPixmap::fromImage(LoadTexture(src, info));
image_pixmap = image_pixmap.scaled(200, 100, Qt::KeepAspectRatio, Qt::SmoothTransformation);
image_widget->setPixmap(image_pixmap);
@@ -37,6 +46,120 @@ public:
}
};
+TextureInfoDockWidget::TextureInfoDockWidget(const Pica::DebugUtils::TextureInfo& info, QWidget* parent)
+ : QDockWidget(tr("Texture 0x%1").arg(info.address, 8, 16, QLatin1Char('0'))),
+ info(info) {
+
+ QWidget* main_widget = new QWidget;
+
+ QLabel* image_widget = new QLabel;
+
+ connect(this, SIGNAL(UpdatePixmap(const QPixmap&)), image_widget, SLOT(setPixmap(const QPixmap&)));
+
+ CSpinBox* phys_address_spinbox = new CSpinBox;
+ phys_address_spinbox->SetBase(16);
+ phys_address_spinbox->SetRange(0, 0xFFFFFFFF);
+ phys_address_spinbox->SetPrefix("0x");
+ phys_address_spinbox->SetValue(info.address);
+ connect(phys_address_spinbox, SIGNAL(ValueChanged(qint64)), this, SLOT(OnAddressChanged(qint64)));
+
+ QComboBox* format_choice = new QComboBox;
+ format_choice->addItem(tr("RGBA8"));
+ format_choice->addItem(tr("RGB8"));
+ format_choice->addItem(tr("RGBA5551"));
+ format_choice->addItem(tr("RGB565"));
+ format_choice->addItem(tr("RGBA4"));
+ format_choice->setCurrentIndex(static_cast<int>(info.format));
+ connect(format_choice, SIGNAL(currentIndexChanged(int)), this, SLOT(OnFormatChanged(int)));
+
+ QSpinBox* width_spinbox = new QSpinBox;
+ width_spinbox->setMaximum(65535);
+ width_spinbox->setValue(info.width);
+ connect(width_spinbox, SIGNAL(valueChanged(int)), this, SLOT(OnWidthChanged(int)));
+
+ QSpinBox* height_spinbox = new QSpinBox;
+ height_spinbox->setMaximum(65535);
+ height_spinbox->setValue(info.height);
+ connect(height_spinbox, SIGNAL(valueChanged(int)), this, SLOT(OnHeightChanged(int)));
+
+ QSpinBox* stride_spinbox = new QSpinBox;
+ stride_spinbox->setMaximum(65535 * 4);
+ stride_spinbox->setValue(info.stride);
+ connect(stride_spinbox, SIGNAL(valueChanged(int)), this, SLOT(OnStrideChanged(int)));
+
+ QVBoxLayout* main_layout = new QVBoxLayout;
+ main_layout->addWidget(image_widget);
+
+ {
+ QHBoxLayout* sub_layout = new QHBoxLayout;
+ sub_layout->addWidget(new QLabel(tr("Source Address:")));
+ sub_layout->addWidget(phys_address_spinbox);
+ main_layout->addLayout(sub_layout);
+ }
+
+ {
+ QHBoxLayout* sub_layout = new QHBoxLayout;
+ sub_layout->addWidget(new QLabel(tr("Format")));
+ sub_layout->addWidget(format_choice);
+ main_layout->addLayout(sub_layout);
+ }
+
+ {
+ QHBoxLayout* sub_layout = new QHBoxLayout;
+ sub_layout->addWidget(new QLabel(tr("Width:")));
+ sub_layout->addWidget(width_spinbox);
+ sub_layout->addStretch();
+ sub_layout->addWidget(new QLabel(tr("Height:")));
+ sub_layout->addWidget(height_spinbox);
+ sub_layout->addStretch();
+ sub_layout->addWidget(new QLabel(tr("Stride:")));
+ sub_layout->addWidget(stride_spinbox);
+ main_layout->addLayout(sub_layout);
+ }
+
+ main_widget->setLayout(main_layout);
+
+ emit UpdatePixmap(ReloadPixmap());
+
+ setWidget(main_widget);
+}
+
+void TextureInfoDockWidget::OnAddressChanged(qint64 value)
+{
+ info.address = value;
+ emit UpdatePixmap(ReloadPixmap());
+}
+
+void TextureInfoDockWidget::OnFormatChanged(int value)
+{
+ info.format = static_cast<Pica::Regs::TextureFormat>(value);
+ emit UpdatePixmap(ReloadPixmap());
+}
+
+void TextureInfoDockWidget::OnWidthChanged(int value)
+{
+ info.width = value;
+ emit UpdatePixmap(ReloadPixmap());
+}
+
+void TextureInfoDockWidget::OnHeightChanged(int value)
+{
+ info.height = value;
+ emit UpdatePixmap(ReloadPixmap());
+}
+
+void TextureInfoDockWidget::OnStrideChanged(int value)
+{
+ info.stride = value;
+ emit UpdatePixmap(ReloadPixmap());
+}
+
+QPixmap TextureInfoDockWidget::ReloadPixmap() const
+{
+ u8* src = Memory::GetPointer(info.address);
+ return QPixmap::fromImage(LoadTexture(src, info));
+}
+
GPUCommandListModel::GPUCommandListModel(QObject* parent) : QAbstractListModel(parent)
{
@@ -106,30 +229,42 @@ void GPUCommandListModel::OnPicaTraceFinished(const Pica::DebugUtils::PicaTrace&
endResetModel();
}
+#define COMMAND_IN_RANGE(cmd_id, reg_name) \
+ (cmd_id >= PICA_REG_INDEX(reg_name) && \
+ cmd_id < PICA_REG_INDEX(reg_name) + sizeof(decltype(Pica::registers.reg_name)) / 4)
+
+void GPUCommandListWidget::OnCommandDoubleClicked(const QModelIndex& index)
+{
+
+ const int command_id = list_widget->model()->data(index, GPUCommandListModel::CommandIdRole).toInt();
+ if (COMMAND_IN_RANGE(command_id, texture0)) {
+ auto info = Pica::DebugUtils::TextureInfo::FromPicaRegister(Pica::registers.texture0,
+ Pica::registers.texture0_format);
+ QMainWindow* main_window = (QMainWindow*)parent();
+ main_window->tabifyDockWidget(this, new TextureInfoDockWidget(info, main_window));
+ }
+}
+
void GPUCommandListWidget::SetCommandInfo(const QModelIndex& index)
{
QWidget* new_info_widget;
-#define COMMAND_IN_RANGE(cmd_id, reg_name) (cmd_id >= PICA_REG_INDEX(reg_name) && cmd_id < PICA_REG_INDEX(reg_name) + sizeof(decltype(Pica::registers.reg_name)) / 4)
const int command_id = list_widget->model()->data(index, GPUCommandListModel::CommandIdRole).toInt();
if (COMMAND_IN_RANGE(command_id, texture0)) {
u8* src = Memory::GetPointer(Pica::registers.texture0.GetPhysicalAddress());
- Pica::DebugUtils::TextureInfo info;
- info.width = Pica::registers.texture0.width;
- info.height = Pica::registers.texture0.height;
- info.stride = 3 * Pica::registers.texture0.width;
- info.format = Pica::registers.texture0_format;
+ auto info = Pica::DebugUtils::TextureInfo::FromPicaRegister(Pica::registers.texture0,
+ Pica::registers.texture0_format);
new_info_widget = new TextureInfoWidget(src, info);
} else {
new_info_widget = new QWidget;
}
-#undef COMMAND_IN_RANGE
widget()->layout()->removeWidget(command_info_widget);
delete command_info_widget;
widget()->layout()->addWidget(new_info_widget);
command_info_widget = new_info_widget;
}
+#undef COMMAND_IN_RANGE
GPUCommandListWidget::GPUCommandListWidget(QWidget* parent) : QDockWidget(tr("Pica Command List"), parent)
{
@@ -145,6 +280,8 @@ GPUCommandListWidget::GPUCommandListWidget(QWidget* parent) : QDockWidget(tr("Pi
connect(list_widget->selectionModel(), SIGNAL(currentChanged(const QModelIndex&,const QModelIndex&)),
this, SLOT(SetCommandInfo(const QModelIndex&)));
+ connect(list_widget, SIGNAL(doubleClicked(const QModelIndex&)),
+ this, SLOT(OnCommandDoubleClicked(const QModelIndex&)));
toggle_tracing = new QPushButton(tr("Start Tracing"));
diff --git a/src/citra_qt/debugger/graphics_cmdlists.hxx b/src/citra_qt/debugger/graphics_cmdlists.hxx
index 37fe19053..a459bba64 100644
--- a/src/citra_qt/debugger/graphics_cmdlists.hxx
+++ b/src/citra_qt/debugger/graphics_cmdlists.hxx
@@ -45,6 +45,8 @@ public:
public slots:
void OnToggleTracing();
+ void OnCommandDoubleClicked(const QModelIndex&);
+
void SetCommandInfo(const QModelIndex&);
signals:
@@ -57,3 +59,25 @@ private:
QWidget* command_info_widget;
QPushButton* toggle_tracing;
};
+
+class TextureInfoDockWidget : public QDockWidget {
+ Q_OBJECT
+
+public:
+ TextureInfoDockWidget(const Pica::DebugUtils::TextureInfo& info, QWidget* parent = nullptr);
+
+signals:
+ void UpdatePixmap(const QPixmap& pixmap);
+
+private slots:
+ void OnAddressChanged(qint64 value);
+ void OnFormatChanged(int value);
+ void OnWidthChanged(int value);
+ void OnHeightChanged(int value);
+ void OnStrideChanged(int value);
+
+private:
+ QPixmap ReloadPixmap() const;
+
+ Pica::DebugUtils::TextureInfo info;
+};
diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp
index 59909c827..31ce09faf 100644
--- a/src/video_core/debug_utils/debug_utils.cpp
+++ b/src/video_core/debug_utils/debug_utils.cpp
@@ -382,6 +382,18 @@ const Math::Vec4<u8> LookupTexture(const u8* source, int x, int y, const Texture
return { source_ptr[2], source_ptr[1], source_ptr[0], 255 };
}
+TextureInfo TextureInfo::FromPicaRegister(const Regs::TextureConfig& config,
+ const Regs::TextureFormat& format)
+{
+ TextureInfo info;
+ info.address = config.GetPhysicalAddress();
+ info.width = config.width;
+ info.height = config.height;
+ info.format = format;
+ info.stride = Pica::Regs::BytesPerPixel(info.format) * info.width;
+ return info;
+}
+
void DumpTexture(const Pica::Regs::TextureConfig& texture_config, u8* data) {
// NOTE: Permanently enabling this just trashes hard disks for no reason.
// Hence, this is currently disabled.
diff --git a/src/video_core/debug_utils/debug_utils.h b/src/video_core/debug_utils/debug_utils.h
index bad4c919a..51f14f12f 100644
--- a/src/video_core/debug_utils/debug_utils.h
+++ b/src/video_core/debug_utils/debug_utils.h
@@ -192,10 +192,14 @@ void OnPicaRegWrite(u32 id, u32 value);
std::unique_ptr<PicaTrace> FinishPicaTracing();
struct TextureInfo {
+ unsigned int address;
int width;
int height;
int stride;
Pica::Regs::TextureFormat format;
+
+ static TextureInfo FromPicaRegister(const Pica::Regs::TextureConfig& config,
+ const Pica::Regs::TextureFormat& format);
};
const Math::Vec4<u8> LookupTexture(const u8* source, int x, int y, const TextureInfo& info);
diff --git a/src/video_core/pica.h b/src/video_core/pica.h
index 10fa73355..c1f35a011 100644
--- a/src/video_core/pica.h
+++ b/src/video_core/pica.h
@@ -130,7 +130,20 @@ struct Regs {
// Seems like they are luminance formats and compressed textures.
};
- BitField<0, 1, u32> texturing_enable;
+ static unsigned BytesPerPixel(TextureFormat format) {
+ if (format == TextureFormat::RGBA8)
+ return 4;
+ else if (format == TextureFormat::RGB8)
+ return 3;
+ else if (format == TextureFormat::RGBA5551 ||
+ format == TextureFormat::RGB565 ||
+ format == TextureFormat::RGBA4)
+ return 2;
+ else // placeholder
+ return 1;
+ }
+
+ BitField< 0, 1, u32> texturing_enable;
TextureConfig texture0;
INSERT_PADDING_WORDS(0x8);
BitField<0, 4, TextureFormat> texture0_format;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 08:08:17 +0100