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

gsdump: fix crash on shutdown & ui refinement work

This commit is contained in:
Gauvain 'GovanifY' Roussel-Tarbouriech 2021-03-07 00:53:47 +01:00 committed by Kojin
parent 7674545814
commit 65291ace12
1 changed files with 36 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,21 +50,20 @@ using namespace pxSizerFlags;
Dialogs::GSDumpDialog::GSDumpDialog(wxWindow* parent) Dialogs::GSDumpDialog::GSDumpDialog(wxWindow* parent)
: wxDialogWithHelpers(parent, _("GSDumpGov"), pxDialogFlags()) : wxDialogWithHelpers(parent, _("GSDumpGov"), pxDialogFlags())
, m_dump_list(new wxListView(this, ID_DUMP_LIST, wxDefaultPosition, wxSize(500, 400), wxLC_NO_HEADER | wxLC_REPORT)) , m_dump_list(new wxListView(this, ID_DUMP_LIST, wxDefaultPosition, wxSize(400, 300), wxLC_NO_HEADER | wxLC_REPORT | wxLC_SINGLE_SEL))
, m_preview_image(new wxStaticBitmap(this, wxID_ANY, wxBitmap(EmbeddedImage<res_NoIcon>().Get()))) , m_preview_image(new wxStaticBitmap(this, wxID_ANY, wxBitmap(EmbeddedImage<res_NoIcon>().Get()), wxDefaultPosition, wxSize(400,250)))
, m_selected_dump(new wxString("")) , m_selected_dump(new wxString(""))
, m_debug_mode(new wxCheckBox(this, ID_DEBUG_MODE, _("Debug Mode"))) , m_debug_mode(new wxCheckBox(this, ID_DEBUG_MODE, _("Debug Mode")))
, m_renderer_overrides(new wxRadioBox()) , m_renderer_overrides(new wxRadioBox())
, m_gif_list(new wxTreeCtrl(this, ID_SEL_PACKET, wxDefaultPosition, wxSize(500, 400), wxTR_HIDE_ROOT | wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT)) , m_gif_list(new wxTreeCtrl(this, ID_SEL_PACKET, wxDefaultPosition, wxSize(400, 300), wxTR_HIDE_ROOT | wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT))
, m_gif_packet(new wxTreeCtrl(this, wxID_ANY, wxDefaultPosition, wxSize(500, 400), wxTR_HIDE_ROOT | wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT)) , m_gif_packet(new wxTreeCtrl(this, wxID_ANY, wxDefaultPosition, wxSize(400, 300), wxTR_HIDE_ROOT | wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT))
, m_start(new wxButton(this, ID_RUN_START, _("Go to Start"))) , m_start(new wxButton(this, ID_RUN_START, _("Go to Start"), wxDefaultPosition, wxSize(150,50)))
, m_step(new wxButton(this, ID_RUN_START, _("Step"))) , m_step(new wxButton(this, ID_RUN_START, _("Step"), wxDefaultPosition, wxSize(150, 50)))
, m_selection(new wxButton(this, ID_RUN_START, _("Run to Selection"))) , m_selection(new wxButton(this, ID_RUN_START, _("Run to Selection"), wxDefaultPosition, wxSize(150, 50)))
, m_vsync(new wxButton(this, ID_RUN_START, _("Go to next VSync"))) , m_vsync(new wxButton(this, ID_RUN_START, _("Go to next VSync"), wxDefaultPosition, wxSize(150, 50)))
, m_thread(std::make_unique<GSThread>(this)) , m_thread(std::make_unique<GSThread>(this))
{ {
//TODO: figure out how to fix sliders so the destructor doesn't segfault //TODO: figure out how to fix sliders so the destructor doesn't segfault
wxFlexGridSizer& general(*new wxFlexGridSizer(2, StdPadding, StdPadding));
wxBoxSizer& dump_info(*new wxBoxSizer(wxVERTICAL)); wxBoxSizer& dump_info(*new wxBoxSizer(wxVERTICAL));
wxBoxSizer& dump_preview(*new wxBoxSizer(wxVERTICAL)); wxBoxSizer& dump_preview(*new wxBoxSizer(wxVERTICAL));
wxFlexGridSizer& debugger(*new wxFlexGridSizer(3, StdPadding, StdPadding)); wxFlexGridSizer& debugger(*new wxFlexGridSizer(3, StdPadding, StdPadding));
@ -76,59 +75,46 @@ Dialogs::GSDumpDialog::GSDumpDialog(wxWindow* parent)
wxArrayString rdoverrides; wxArrayString rdoverrides;
rdoverrides.Add("None"); rdoverrides.Add("None");
rdoverrides.Add("OGL SW");
rdoverrides.Add("D3D11 HW"); rdoverrides.Add("D3D11 HW");
rdoverrides.Add("OGL HW"); rdoverrides.Add("OGL HW");
rdoverrides.Add("OGL SW"); m_renderer_overrides->Create(this, wxID_ANY, "Renderer overrides", wxDefaultPosition, wxDefaultSize, rdoverrides, 1);
m_renderer_overrides->Create(this, wxID_ANY, "Renderer overrides", wxDefaultPosition, wxSize(300, 120), rdoverrides, 2);
dump_info += m_renderer_overrides;
dump_info += new wxButton(this, ID_RUN_DUMP, _("Run"));
m_debug_mode->Disable();
m_start->Disable();
m_step->Disable();
m_selection->Disable();
m_vsync->Disable();
// debugger
dbg_tree += new wxStaticText(this, wxID_ANY, _("GIF Packets")); dbg_tree += new wxStaticText(this, wxID_ANY, _("GIF Packets"));
dbg_tree += m_gif_list; dbg_tree += m_gif_list | StdExpand();
dbg_actions += m_debug_mode; dbg_actions += m_debug_mode;
dbg_actions += m_start; dbg_actions += m_start | StdExpand();
dbg_actions += m_step; dbg_actions += m_step | StdExpand();
dbg_actions += m_selection; dbg_actions += m_selection | StdExpand();
dbg_actions += m_vsync; dbg_actions += m_vsync | StdExpand();
// gif
gif += new wxStaticText(this, wxID_ANY, _("Packet Content")); gif += new wxStaticText(this, wxID_ANY, _("Packet Content"));
gif += m_gif_packet; gif += m_gif_packet | StdExpand();
debugger += dbg_tree;
debugger += dbg_actions;
GetDumpsList();
dumps_list += new wxStaticText(this, wxID_ANY, _("GS Dumps List"));
dumps_list += m_dump_list;
dump_preview += new wxStaticText(this, wxID_ANY, _("Preview"));
dump_preview += m_preview_image;
dumps_list += new wxStaticText(this, wxID_ANY, _("GS Dumps List")) | StdExpand();
dumps_list += m_dump_list | StdExpand();
dump_info += m_renderer_overrides | StdExpand();
dump_info += new wxButton(this, ID_RUN_DUMP, _("Run"), wxDefaultPosition, wxSize(150,100)) | StdExpand();
dump_preview += new wxStaticText(this, wxID_ANY, _("Preview")) | StdExpand();
dump_preview += m_preview_image | StdCenter();
dumps += dumps_list; dumps += dumps_list;
dumps += dump_info; dumps += dump_info;
dumps += dump_preview; dumps += dump_preview;
general += dumps; debugger += dbg_tree;
general += dump_info; debugger += dbg_actions;
general += debugger; debugger += gif;
general += gif;
*this += dumps;
*this += debugger;
*this += general; // populate UI and setup state
m_debug_mode->Disable();
SetSizerAndFit(GetSizer()); m_start->Disable();
m_step->Disable();
m_selection->Disable();
m_vsync->Disable();
GetDumpsList();
Bind(wxEVT_LIST_ITEM_SELECTED, &Dialogs::GSDumpDialog::SelectedDump, this, ID_DUMP_LIST); Bind(wxEVT_LIST_ITEM_SELECTED, &Dialogs::GSDumpDialog::SelectedDump, this, ID_DUMP_LIST);
Bind(wxEVT_BUTTON, &Dialogs::GSDumpDialog::RunDump, this, ID_RUN_DUMP); Bind(wxEVT_BUTTON, &Dialogs::GSDumpDialog::RunDump, this, ID_RUN_DUMP);
@ -166,7 +152,7 @@ void Dialogs::GSDumpDialog::SelectedDump(wxListEvent& evt)
if (wxFileExists(filename_preview)) if (wxFileExists(filename_preview))
{ {
auto img = wxImage(filename_preview); auto img = wxImage(filename_preview);
img.Rescale(250 * MSW_GetDPIScale(), 200 * MSW_GetDPIScale(), wxIMAGE_QUALITY_HIGH); img.Rescale(400,250, wxIMAGE_QUALITY_HIGH);
m_preview_image->SetBitmap(wxBitmap(img)); m_preview_image->SetBitmap(wxBitmap(img));
delete m_selected_dump; delete m_selected_dump;
m_selected_dump = new wxString(filename); m_selected_dump = new wxString(filename);