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

gsdump: fix parsing of last packet in non debug mode and code simplification

This commit is contained in:
Gauvain 'GovanifY' Roussel-Tarbouriech 2021-03-07 21:33:37 +01:00 committed by Kojin
parent 3cfc00b355
commit a4e01d4593
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pcsx2/gui/Dialogs/GSDumpDialog.cpp
View File

@ -184,7 +184,7 @@ void Dialogs::GSDumpDialog::RunDump(wxCommandEvent& event)
return; return;
} }
void Dialogs::GSDumpDialog::ProcessDumpEvent(GSData& event, char* regs) void Dialogs::GSDumpDialog::ProcessDumpEvent(const GSData& event, char* regs)
{ {
switch (event.id) switch (event.id)
{ {
@ -249,13 +249,13 @@ void Dialogs::GSDumpDialog::ToStart(wxCommandEvent& event)
m_button_events.push_back(GSEvent{RunCursor, 0}); m_button_events.push_back(GSEvent{RunCursor, 0});
} }
void Dialogs::GSDumpDialog::GenPacketList(std::vector<GSData>& dump) void Dialogs::GSDumpDialog::GenPacketList()
{ {
int i = 0; int i = 0;
m_gif_list->DeleteAllItems(); m_gif_list->DeleteAllItems();
wxTreeItemId mainrootId = m_gif_list->AddRoot("root"); wxTreeItemId mainrootId = m_gif_list->AddRoot("root");
wxTreeItemId rootId = m_gif_list->AppendItem(mainrootId, "0 - VSync"); wxTreeItemId rootId = m_gif_list->AppendItem(mainrootId, "0 - VSync");
for (auto& element : dump) for (auto& element : m_dump_packets)
{ {
wxString s, t; wxString s, t;
element.id == Transfer ? t.Printf(" - %s", GSTransferPathNames[element.path]) : t.Printf(""); element.id == Transfer ? t.Printf(" - %s", GSTransferPathNames[element.path]) : t.Printf("");
@ -577,7 +577,7 @@ void Dialogs::GSDumpDialog::ParseTreePrim(wxTreeItemId& id, u32 prim)
void Dialogs::GSDumpDialog::CheckDebug(wxCommandEvent& event) void Dialogs::GSDumpDialog::CheckDebug(wxCommandEvent& event)
{ {
if (m_debug_mode->GetValue()) if (m_debug_mode->GetValue())
GenPacketList(m_dump_packets); GenPacketList();
else else
{ {
m_gif_list->DeleteAllItems(); m_gif_list->DeleteAllItems();
@ -675,7 +675,7 @@ void Dialogs::GSDumpDialog::GSThread::ExecuteTaskInThread()
} }
if (m_root_window->m_debug_mode->GetValue()) if (m_root_window->m_debug_mode->GetValue())
m_root_window->GenPacketList(m_root_window->m_dump_packets); m_root_window->GenPacketList();
//return here to debug pre gs //return here to debug pre gs
//return; //return;
@ -743,20 +743,19 @@ void Dialogs::GSDumpDialog::GSThread::ExecuteTaskInThread()
} }
// do vsync // do vsync
GSData vsync_end = {VSync, 0, 0, Dummy}; m_root_window->ProcessDumpEvent({VSync, 0, 0, Dummy}, regs);
m_root_window->ProcessDumpEvent(vsync_end, regs);
} }
} }
else else
{ {
while (i < (m_root_window->m_dump_packets.size()-1)) while (i < (m_root_window->m_dump_packets.size()))
{ {
m_root_window->ProcessDumpEvent(m_root_window->m_dump_packets[i++], regs); m_root_window->ProcessDumpEvent(m_root_window->m_dump_packets[i++], regs);
if (m_root_window->m_dump_packets[i].id == VSync) if (i >= m_root_window->m_dump_packets.size() || m_root_window->m_dump_packets[i].id == VSync)
break; break;
} }
if (i >= m_root_window->m_dump_packets.size()-1) if (i >= m_root_window->m_dump_packets.size())
i = 0; i = 0;
} }
} }

4
pcsx2/gui/Dialogs/ModalPopups.h
View File

@ -341,8 +341,8 @@ namespace Dialogs
std::vector<GSData> m_dump_packets; std::vector<GSData> m_dump_packets;
float m_stored_q = 1.0; float m_stored_q = 1.0;
void ProcessDumpEvent(GSData& event, char* regs); void ProcessDumpEvent(const GSData& event, char* regs);
void GenPacketList(std::vector<GSData>& dump); void GenPacketList();
void GenPacketInfo(GSData& dump); void GenPacketInfo(GSData& dump);
void ParseTreeReg(wxTreeItemId& id, GIFReg reg, u128 data, bool packed); void ParseTreeReg(wxTreeItemId& id, GIFReg reg, u128 data, bool packed);
void ParseTreePrim(wxTreeItemId& id, u32 prim); void ParseTreePrim(wxTreeItemId& id, u32 prim);