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

Revert "pcsx2: call XInitThreads at init" 

This reverts commit 99180f5afb.

Unfortunately Mint/Arch got segmentation fault in Xlib mutex locking...
Sadly Xlib will be back to thread-unsafe mode.

I'm cooking another solution based on EGL
This commit is contained in:
Gregory Hainaut 2017-04-30 12:44:57 +02:00
parent a3b3b4f657
commit 98a5492e37
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2/CMakeLists.txt
View File

@ -662,7 +662,6 @@ set(pcsx2FinalLibs
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${AIO_LIBRARIES} ${AIO_LIBRARIES}
${GCOV_LIBRARIES} ${GCOV_LIBRARIES}
${X11_LIBRARIES}
) )
if(BUILTIN_GS) if(BUILTIN_GS)

12
pcsx2/gui/AppInit.cpp
View File

@ -424,20 +424,8 @@ protected:
} }
}; };
#ifdef __unix__
#include <X11/Xlib.h>
#endif
bool Pcsx2App::OnInit() bool Pcsx2App::OnInit()
{ {
#ifdef __unix__
// By default X11 isn't thread safe
// Typically it avoid a crash on Mesa when glthread is enabled on DRI2
//
// I guess it could be removed once we migrate to Wayland (post 2020)
XInitThreads();
#endif
EnableAllLogging(); EnableAllLogging();
Console.WriteLn("Interface is initializing. Entering Pcsx2App::OnInit!"); Console.WriteLn("Interface is initializing. Entering Pcsx2App::OnInit!");