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

gsdump: make wxwidgets highlight selected packet on debug mode

This commit is contained in:
Gauvain 'GovanifY' Roussel-Tarbouriech 2021-03-08 21:28:23 +01:00 committed by Kojin
parent ce24c87a3f
commit 1248aa95cb
2 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,7 +244,11 @@ void Dialogs::GSDumpDialog::ProcessDumpEvent(const GSData& event, char* regs)
void Dialogs::GSDumpDialog::StepPacket(wxCommandEvent& event) void Dialogs::GSDumpDialog::StepPacket(wxCommandEvent& event)
{ {
m_button_events.push_back(GSEvent{Step, 0}); if (m_thread->m_debug_index < m_gif_items.size() - 1)
{
m_gif_list->SelectItem(m_gif_items[m_thread->m_debug_index + 1]);
m_button_events.push_back(GSEvent{Step, 0});
}
} }
void Dialogs::GSDumpDialog::ToCursor(wxCommandEvent& event) void Dialogs::GSDumpDialog::ToCursor(wxCommandEvent& event)
@ -254,11 +258,20 @@ void Dialogs::GSDumpDialog::ToCursor(wxCommandEvent& event)
void Dialogs::GSDumpDialog::ToVSync(wxCommandEvent& event) void Dialogs::GSDumpDialog::ToVSync(wxCommandEvent& event)
{ {
m_button_events.push_back(GSEvent{RunVSync, 0}); if (m_thread->m_debug_index < m_gif_items.size() - 1)
{
wxTreeItemId pkt = m_gif_items[m_thread->m_debug_index];
if (!m_gif_list->ItemHasChildren(pkt))
pkt = m_gif_list->GetItemParent(pkt);
if (m_gif_list->GetNextSibling(pkt).IsOk())
m_gif_list->SelectItem(m_gif_list->GetNextSibling(pkt));
m_button_events.push_back(GSEvent{RunVSync, 0});
}
} }
void Dialogs::GSDumpDialog::ToStart(wxCommandEvent& event) void Dialogs::GSDumpDialog::ToStart(wxCommandEvent& event)
{ {
m_gif_list->SelectItem(m_gif_items[0]);
m_button_events.push_back(GSEvent{RunCursor, 0}); m_button_events.push_back(GSEvent{RunCursor, 0});
} }
@ -266,6 +279,7 @@ void Dialogs::GSDumpDialog::GenPacketList()
{ {
int i = 0; int i = 0;
m_gif_list->DeleteAllItems(); m_gif_list->DeleteAllItems();
m_gif_items.clear();
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 : m_dump_packets) for (auto& element : m_dump_packets)
@ -277,12 +291,18 @@ void Dialogs::GSDumpDialog::GenPacketList()
{ {
m_gif_list->SetItemText(rootId, s); m_gif_list->SetItemText(rootId, s);
rootId = m_gif_list->AppendItem(mainrootId, "VSync"); rootId = m_gif_list->AppendItem(mainrootId, "VSync");
m_gif_items.push_back(rootId);
} }
else else
m_gif_list->AppendItem(rootId, s); {
wxTreeItemId tmp = m_gif_list->AppendItem(rootId, s);
m_gif_items.push_back(tmp);
}
i++; i++;
} }
m_gif_list->Delete(rootId); m_gif_list->Delete(rootId);
m_gif_list->SelectItem(m_gif_items[0]);
} }
void Dialogs::GSDumpDialog::GenPacketInfo(GSData& dump) void Dialogs::GSDumpDialog::GenPacketInfo(GSData& dump)
@ -463,7 +483,7 @@ void Dialogs::GSDumpDialog::ParseTreeReg(wxTreeItemId& id, GIFReg reg, u128 data
v = (double)((data.lo >> 32) & ((u64)(1 << 14) - 1)) / 16.0; v = (double)((data.lo >> 32) & ((u64)(1 << 14) - 1)) / 16.0;
else else
v = (double)((data.lo >> 16) & ((u64)(1 << 14) - 1)) / 16.0; v = (double)((data.lo >> 16) & ((u64)(1 << 14) - 1)) / 16.0;
t.Printf("V = %u", v); t.Printf("V = %f", v);
m_gif_packet->AppendItem(rootId, s); m_gif_packet->AppendItem(rootId, s);
m_gif_packet->AppendItem(rootId, t); m_gif_packet->AppendItem(rootId, t);
break; break;
@ -751,7 +771,7 @@ void Dialogs::GSDumpDialog::GSThread::ExecuteTaskInThread()
GetCorePlugins().DoFreeze(PluginId_GS, 0, &fd, true); GetCorePlugins().DoFreeze(PluginId_GS, 0, &fd, true);
size_t i = 0; size_t i = 0;
size_t run_to = 0; m_debug_index = 0;
size_t debug_idx = 0; size_t debug_idx = 0;
while (GSDump::isRunning) while (GSDump::isRunning)
@ -765,34 +785,38 @@ void Dialogs::GSDumpDialog::GSThread::ExecuteTaskInThread()
case Step: case Step:
if (debug_idx >= m_root_window->m_dump_packets.size()) if (debug_idx >= m_root_window->m_dump_packets.size())
debug_idx = 0; debug_idx = 0;
run_to = debug_idx; m_debug_index = debug_idx;
break; break;
case RunCursor: case RunCursor:
run_to = m_root_window->m_button_events[0].index; m_debug_index = m_root_window->m_button_events[0].index;
if (debug_idx > run_to) if (debug_idx > m_debug_index)
debug_idx = 0; debug_idx = 0;
break; break;
case RunVSync: case RunVSync:
if (debug_idx >= m_root_window->m_dump_packets.size()) if (debug_idx >= m_root_window->m_dump_packets.size())
debug_idx = 1; debug_idx = 1;
auto it = std::find_if(m_root_window->m_dump_packets.begin() + debug_idx + 1, m_root_window->m_dump_packets.end(), [](const GSData& gs) { return gs.id == Registers; }); if ((debug_idx + 1) < m_root_window->m_dump_packets.size())
if (it != std::end(m_root_window->m_dump_packets)) {
run_to = std::distance(m_root_window->m_dump_packets.begin(), it); auto it = std::find_if(m_root_window->m_dump_packets.begin() + debug_idx + 1, m_root_window->m_dump_packets.end(), [](const GSData& gs) { return gs.id == Registers; });
if (it != std::end(m_root_window->m_dump_packets))
m_debug_index = std::distance(m_root_window->m_dump_packets.begin(), it);
}
break; break;
} }
m_root_window->m_button_events.erase(m_root_window->m_button_events.begin()); m_root_window->m_button_events.erase(m_root_window->m_button_events.begin());
if (debug_idx <= run_to) if (debug_idx <= m_debug_index)
{ {
while (debug_idx <= run_to) while (debug_idx <= m_debug_index)
{ {
m_root_window->ProcessDumpEvent(m_root_window->m_dump_packets[debug_idx++], regs); m_root_window->ProcessDumpEvent(m_root_window->m_dump_packets[debug_idx++], regs);
} }
auto it = std::find_if(m_root_window->m_dump_packets.begin() + debug_idx + 1, m_root_window->m_dump_packets.end(), [](const GSData& gs) { return gs.id == Registers; }); if ((debug_idx + 1) < m_root_window->m_dump_packets.size())
if (it != std::end(m_root_window->m_dump_packets)) {
m_root_window->ProcessDumpEvent(*it, regs); auto it = std::find_if(m_root_window->m_dump_packets.begin() + debug_idx + 1, m_root_window->m_dump_packets.end(), [](const GSData& gs) { return gs.id == Registers; });
if (it != std::end(m_root_window->m_dump_packets))
debug_idx--; m_root_window->ProcessDumpEvent(*it, regs);
}
} }
// do vsync // do vsync

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

@ -341,6 +341,7 @@ namespace Dialogs
}; };
std::vector<GSEvent> m_button_events; std::vector<GSEvent> m_button_events;
std::vector<GSData> m_dump_packets; std::vector<GSData> m_dump_packets;
std::vector<wxTreeItemId> m_gif_items;
float m_stored_q = 1.0; float m_stored_q = 1.0;
void ProcessDumpEvent(const GSData& event, char* regs); void ProcessDumpEvent(const GSData& event, char* regs);
@ -358,6 +359,7 @@ namespace Dialogs
GSDumpDialog* m_root_window; GSDumpDialog* m_root_window;
public: public:
size_t m_debug_index;
std::unique_ptr<pxInputStream> m_dump_file; std::unique_ptr<pxInputStream> m_dump_file;
GSThread(GSDumpDialog* dlg); GSThread(GSDumpDialog* dlg);
virtual ~GSThread(); virtual ~GSThread();