ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 0f0fd13f28 into 53b54406bd

This commit is contained in:
Tygyh 2025-05-27 18:37:57 -05:00 committed by GitHub
parent 53b54406bd 0f0fd13f28
commit 40340e1ed2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp
View File

@ -47,7 +47,7 @@ FIFOAnalyzer::FIFOAnalyzer(FifoPlayer& fifo_player) : m_fifo_player(fifo_player)
UpdateTree();
auto& settings = Settings::GetQSettings();
const auto& settings = Settings::GetQSettings();
m_object_splitter->restoreState(
settings.value(QStringLiteral("fifoanalyzer/objectsplitter")).toByteArray());
@ -133,7 +133,7 @@ void FIFOAnalyzer::Update()
UpdateDescription();
}
void FIFOAnalyzer::UpdateTree()
void FIFOAnalyzer::UpdateTree() const
{
m_tree_widget->clear();
@ -147,7 +147,7 @@ void FIFOAnalyzer::UpdateTree()
m_tree_widget->addTopLevelItem(recording_item);
auto* file = m_fifo_player.GetFile();
const auto* file = m_fifo_player.GetFile();
const u32 frame_count = file->GetFrameCount();
@ -202,9 +202,9 @@ namespace
class DetailCallback : public OpcodeDecoder::Callback
{
public:
explicit DetailCallback(CPState cpmem) : m_cpmem(cpmem) {}
explicit DetailCallback(const CPState& cpmem) : m_cpmem(cpmem) {}
OPCODE_CALLBACK(void OnCP(u8 command, u32 value))
OPCODE_CALLBACK(void OnCP(const u8 command, const u32 value))
{
// Note: No need to update m_cpmem as it already has the final value for this object
@ -217,7 +217,7 @@ public:
.arg(QString::fromStdString(name));
}
OPCODE_CALLBACK(void OnXF(u16 address, u8 count, const u8* data))
OPCODE_CALLBACK(void OnXF(const u16 address, const u8 count, const u8* data))
{
const auto [name, desc] = GetXFTransferInfo(address, count, data);
ASSERT(!name.empty());
@ -236,7 +236,7 @@ public:
text += QStringLiteral(" ") + QString::fromStdString(name);
}
OPCODE_CALLBACK(void OnBP(u8 command, u32 value))
OPCODE_CALLBACK(void OnBP(const u8 command, const u32 value))
{
const auto [name, desc] = GetBPRegInfo(command, value);
ASSERT(!name.empty());
@ -246,15 +246,17 @@ public:
.arg(value, 6, 16, QLatin1Char('0'))
.arg(QString::fromStdString(name));
}
OPCODE_CALLBACK(void OnIndexedLoad(CPArray array, u32 index, u16 address, u8 size))
OPCODE_CALLBACK(void OnIndexedLoad(const CPArray array, const u32 index, const u16 address,
const u8 size))
{
const auto [desc, written] = GetXFIndexedLoadInfo(array, index, address, size);
text = QStringLiteral("LOAD INDX %1 %2")
.arg(QString::fromStdString(fmt::to_string(array)))
.arg(QString::fromStdString(desc));
}
OPCODE_CALLBACK(void OnPrimitiveCommand(OpcodeDecoder::Primitive primitive, u8 vat,
u32 vertex_size, u16 num_vertices, const u8* vertex_data))
OPCODE_CALLBACK(void OnPrimitiveCommand(const OpcodeDecoder::Primitive primitive, const u8 vat,
const u32 vertex_size, const u16 num_vertices,
const u8* vertex_data))
{
const auto name = fmt::to_string(primitive);
@ -284,14 +286,14 @@ public:
#endif
}
OPCODE_CALLBACK(void OnDisplayList(u32 address, u32 size))
OPCODE_CALLBACK(void OnDisplayList(const u32 address, const u32 size))
{
text = QObject::tr("Call display list at %1 with size %2")
.arg(address, 8, 16, QLatin1Char('0'))
.arg(size, 8, 16, QLatin1Char('0'));
}
OPCODE_CALLBACK(void OnNop(u32 count))
OPCODE_CALLBACK(void OnNop(const u32 count))
{
if (count > 1)
text = QStringLiteral("NOP (%1x)").arg(count);
@ -314,7 +316,7 @@ public:
OPCODE_CALLBACK(CPState& GetCPState()) { return m_cpmem; }
OPCODE_CALLBACK(u32 GetVertexSize(u8 vat))
OPCODE_CALLBACK(u32 GetVertexSize(const u8 vat))
{
return VertexLoaderBase::GetVertexSize(GetCPState().vtx_desc, GetCPState().vtx_attr[vat]);
}
@ -473,7 +475,7 @@ void FIFOAnalyzer::FindNext()
const int index = m_detail_list->currentRow();
ASSERT(index >= 0);
auto next_result = std::ranges::find_if(
const auto next_result = std::ranges::find_if(
m_search_results, [index](auto& result) { return result.m_cmd > static_cast<u32>(index); });
if (next_result != m_search_results.end())
{
@ -486,7 +488,7 @@ void FIFOAnalyzer::FindPrevious()
const int index = m_detail_list->currentRow();
ASSERT(index >= 0);
auto prev_result =
const auto prev_result =
std::ranges::find_if(m_search_results | std::views::reverse, [index](auto& result) {
return result.m_cmd < static_cast<u32>(index);
});
@ -496,7 +498,7 @@ void FIFOAnalyzer::FindPrevious()
}
}
void FIFOAnalyzer::ShowSearchResult(size_t index)
void FIFOAnalyzer::ShowSearchResult(const size_t index)
{
if (m_search_results.empty())
return;
@ -527,7 +529,7 @@ class DescriptionCallback : public OpcodeDecoder::Callback
public:
explicit DescriptionCallback(const CPState& cpmem) : m_cpmem(cpmem) {}
OPCODE_CALLBACK(void OnBP(u8 command, u32 value))
OPCODE_CALLBACK(void OnBP(const u8 command, const u32 value))
{
const auto [name, desc] = GetBPRegInfo(command, value);
ASSERT(!name.empty());
@ -542,7 +544,7 @@ public:
text += QString::fromStdString(desc);
}
OPCODE_CALLBACK(void OnCP(u8 command, u32 value))
OPCODE_CALLBACK(void OnCP(const u8 command, const u32 value))
{
// Note: No need to update m_cpmem as it already has the final value for this object
@ -559,7 +561,7 @@ public:
text += QString::fromStdString(desc);
}
OPCODE_CALLBACK(void OnXF(u16 address, u8 count, const u8* data))
OPCODE_CALLBACK(void OnXF(const u16 address, const u8 count, const u8* data))
{
const auto [name, desc] = GetXFTransferInfo(address, count, data);
ASSERT(!name.empty());
@ -574,7 +576,8 @@ public:
text += QString::fromStdString(desc);
}
OPCODE_CALLBACK(void OnIndexedLoad(CPArray array, u32 index, u16 address, u8 size))
OPCODE_CALLBACK(void OnIndexedLoad(const CPArray array, const u32 index, const u16 address,
const u8 size))
{
const auto [desc, written] = GetXFIndexedLoadInfo(array, index, address, size);
@ -606,7 +609,8 @@ public:
}
OPCODE_CALLBACK(void OnPrimitiveCommand(OpcodeDecoder::Primitive primitive, u8 vat,
u32 vertex_size, u16 num_vertices, const u8* vertex_data))
const u32 vertex_size, const u16 num_vertices,
const u8* vertex_data))
{
const auto name = fmt::format("{} VAT {}", primitive, vat);
@ -619,8 +623,8 @@ public:
const auto& vtx_attr = m_cpmem.vtx_attr[vat];
u32 i = 0;
const auto process_component = [&](VertexComponentFormat cformat, ComponentFormat format,
u32 non_indexed_count, u32 indexed_count = 1) {
const auto process_component = [&](const VertexComponentFormat cformat, ComponentFormat format,
const u32 non_indexed_count, const u32 indexed_count = 1) {
u32 count;
if (cformat == VertexComponentFormat::NotPresent)
return;
@ -656,7 +660,7 @@ public:
}
text += QLatin1Char{' '};
};
const auto process_simple_component = [&](u32 size) {
const auto process_simple_component = [&](const u32 size) {
for (u32 component_off = 0; component_off < size; component_off++)
{
text += QStringLiteral("%1").arg(vertex_data[i + component_off], 2, 16, QLatin1Char('0'));
@ -734,7 +738,7 @@ public:
OPCODE_CALLBACK(CPState& GetCPState()) { return m_cpmem; }
OPCODE_CALLBACK(u32 GetVertexSize(u8 vat))
OPCODE_CALLBACK(u32 GetVertexSize(const u8 vat))
{
return VertexLoaderBase::GetVertexSize(GetCPState().vtx_desc, GetCPState().vtx_attr[vat]);
}
@ -744,7 +748,7 @@ public:
};
} // namespace
void FIFOAnalyzer::UpdateDescription()
void FIFOAnalyzer::UpdateDescription() const
{
m_entry_detail_browser->clear();

4
Source/Core/DolphinQt/FIFO/FIFOAnalyzer.h
View File

@ -40,9 +40,9 @@ private:
void ShowSearchResult(size_t index);
void UpdateTree();
void UpdateTree() const;
void UpdateDetails();
void UpdateDescription();
void UpdateDescription() const;
void OnDebugFontChanged(const QFont& font);