RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-08 16:05:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

handle empty callback returns

Browse source
This commit is contained in:
Megamouse 2019-06-20 15:51:50 +02:00
parent 08c581947d
commit 8debdfcd09
6 changed files with 91 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rpcs3/Emu/RSX/GSRender.cpp
View file

@ -6,7 +6,14 @@
GSRender::GSRender()
{
m_frame = Emu.GetCallbacks().get_gs_frame().release();
if (auto gs_frame = Emu.GetCallbacks().get_gs_frame())
{
m_frame = gs_frame.release();
}
else
{
m_frame = nullptr;
}
}
GSRender::~GSRender()

50
rpcs3/Emu/RSX/rsx_cache.h
View file

@ -430,25 +430,28 @@ namespace rsx
virtual void create()
{
dlg = Emu.GetCallbacks().get_msg_dialog();
dlg->type.se_normal = true;
dlg->type.bg_invisible = true;
dlg->type.progress_bar_count = 2;
dlg->ProgressBarSetTaskbarIndex(-1); // -1 to combine all progressbars in the taskbar progress
dlg->on_close = [](s32 status)
if (dlg)
{
Emu.CallAfter([]()
dlg->type.se_normal = true;
dlg->type.bg_invisible = true;
dlg->type.progress_bar_count = 2;
dlg->ProgressBarSetTaskbarIndex(-1); // -1 to combine all progressbars in the taskbar progress
dlg->on_close = [](s32 status)
{
Emu.Stop();
Emu.CallAfter([]()
{
Emu.Stop();
});
};
ref_cnt++;
Emu.CallAfter([&]()
{
dlg->Create("Preloading cached shaders from disk.\nPlease wait...", "Shader Compilation");
ref_cnt--;
});
};
ref_cnt++;
Emu.CallAfter([&]()
{
dlg->Create("Preloading cached shaders from disk.\nPlease wait...", "Shader Compilation");
ref_cnt--;
});
}
while (ref_cnt.load() && !Emu.IsStopped())
{
@ -458,6 +461,11 @@ namespace rsx
virtual void update_msg(u32 index, u32 processed, u32 entry_count)
{
if (!dlg)
{
return;
}
ref_cnt++;
Emu.CallAfter([&, index, processed, entry_count]()
@ -470,6 +478,11 @@ namespace rsx
virtual void inc_value(u32 index, u32 value)
{
if (!dlg)
{
return;
}
ref_cnt++;
Emu.CallAfter([&, index, value]()
@ -481,6 +494,11 @@ namespace rsx
virtual void set_limit(u32 index, u32 limit)
{
if (!dlg)
{
return;
}
ref_cnt++;
Emu.CallAfter([&, index, limit]()