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

GS: Move GSinit()/GSshutdown() to GS thread 

This initializes COM, so it has to be done on the thread which is
actually going to use it.
This commit is contained in:
Connor McLaughlin 2022-05-24 00:19:55 +10:00 committed by refractionpcsx2
parent a92eb4d10a
commit 6a4df2a641
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcsx2/MTGS.cpp
View File

@ -110,9 +110,17 @@ void SysMtgsThread::ShutdownThread()
void SysMtgsThread::ThreadEntryPoint()
{
m_thread_handle = Threading::ThreadHandle::GetForCallingThread();
Threading::SetNameOfCurrentThread("GS");
if (GSinit() != 0)
{
Host::ReportErrorAsync("Error", "GSinit() failed.");
m_open_or_close_done.Post();
return;
}
m_thread_handle = Threading::ThreadHandle::GetForCallingThread();
for (;;)
{
// wait until we're actually asked to initialize (and config has been loaded, etc)
@ -154,6 +162,8 @@ void SysMtgsThread::ThreadEntryPoint()
// we need to reset sem_event here, because MainLoop() kills it.
m_sem_event.Reset();
}
GSshutdown();
}
void SysMtgsThread::ResetGS()

13
pcsx2/VMManager.cpp
View File

@ -647,19 +647,6 @@ bool VMManager::Initialize(const VMBootParameters& boot_params)
ScopedGuard close_cdvd = [] { DoCDVDclose(); };
Console.WriteLn("Opening GS...");
// TODO: Get rid of thread state nonsense and just make it a "normal" thread.
static bool gs_initialized = false;
if (!gs_initialized)
{
if (GSinit() != 0)
{
Console.WriteLn("Failed to initialize GS.");
return false;
}
gs_initialized = true;
}
if (!GetMTGS().WaitForOpen())
{
// we assume GS is going to report its own error

1
pcsx2/gui/SysCoreThread.cpp
View File

@ -112,7 +112,6 @@ void SysCoreThread::OnSuspendInThread()
void SysCoreThread::Start()
{
GSinit();
SPU2init();
PADinit();
DEV9init();