From 98a5492e371c50653fcf6965f9b3a557961d64f6 Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Sun, 30 Apr 2017 12:44:57 +0200 Subject: [PATCH] Revert "pcsx2: call XInitThreads at init" This reverts commit 99180f5afbe012d87ef2cd68c3250e3dde90f396. 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 --- pcsx2/CMakeLists.txt | 1 - pcsx2/gui/AppInit.cpp | 12 ------------ 2 files changed, 13 deletions(-) diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index 280e17dea7..dc3efb50bc 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -662,7 +662,6 @@ set(pcsx2FinalLibs ${ZLIB_LIBRARIES} ${AIO_LIBRARIES} ${GCOV_LIBRARIES} - ${X11_LIBRARIES} ) if(BUILTIN_GS) diff --git a/pcsx2/gui/AppInit.cpp b/pcsx2/gui/AppInit.cpp index 27ad012b26..20683f14fc 100644 --- a/pcsx2/gui/AppInit.cpp +++ b/pcsx2/gui/AppInit.cpp @@ -424,20 +424,8 @@ protected: } }; -#ifdef __unix__ -#include -#endif - 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(); Console.WriteLn("Interface is initializing. Entering Pcsx2App::OnInit!");