AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'visigen-hang' into 'master' 

Fix VISIGen hang on X11/NVIDIA

See merge request AxioDL/urde!22
This commit is contained in:
Phillip Stephens 2019-11-19 20:51:36 -08:00
parent b23575f2aa b895a2a757
commit e620c4e835
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
visigen/MainXlib.cpp
View File

@ -254,6 +254,7 @@ int main(int argc, const char** argv) {
Log.report(logvisor::Fatal, fmt("unable to make GLX context current")); Log.report(logvisor::Fatal, fmt("unable to make GLX context current"));
XUnlockDisplay(xDisp); XUnlockDisplay(xDisp);
UpdatePercent(0);
renderer.Run(UpdatePercent); renderer.Run(UpdatePercent);
XLockDisplay(xDisp); XLockDisplay(xDisp);
@ -295,7 +296,6 @@ int main(int argc, const char** argv) {
} }
renderer.Terminate(); renderer.Terminate();
pthread_cancel(clientThread.native_handle());
if (clientThread.joinable()) if (clientThread.joinable())
clientThread.join(); clientThread.join();

1
visigen/VISIBuilder.cpp
View File

@ -265,7 +265,6 @@ std::vector<uint8_t> VISIBuilder::build(const zeus::CAABox& fullAabb, size_t mod
Progress prog(updatePercent); Progress prog(updatePercent);
#ifndef _WIN32 #ifndef _WIN32
parentPid = getppid();
auto terminate = [this, parentPid]() { auto terminate = [this, parentPid]() {
return renderCache.m_renderer.m_terminate || (parentPid ? kill(parentPid, 0) : false); return renderCache.m_renderer.m_terminate || (parentPid ? kill(parentPid, 0) : false);
}; };