The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-09 15:49:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12510 from JosJuice/android-revert-attach-early

Browse Source 
Revert "Android: Attach CPU thread to JVM early"
This commit is contained in:
Mai 2024-01-21 10:23:15 -05:00 committed by GitHub
commit 713572e874
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Core/Core.cpp
View File

@ -96,10 +96,6 @@
#include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoBackendBase.h"
#include "VideoCommon/VideoEvents.h" #include "VideoCommon/VideoEvents.h"
#ifdef ANDROID
#include "jni/AndroidCommon/IDCache.h"
#endif
namespace Core namespace Core
{ {
static bool s_wants_determinism; static bool s_wants_determinism;
@ -388,12 +384,6 @@ static void CpuThread(Core::System& system, const std::optional<std::string>& sa
// Clear performance data collected from previous threads. // Clear performance data collected from previous threads.
g_perf_metrics.Reset(); g_perf_metrics.Reset();
#ifdef ANDROID
// For some reason, calling the JNI function AttachCurrentThread from the CPU thread after a
// certain point causes a crash if fastmem is enabled. Let's call it early to avoid that problem.
static_cast<void>(IDCache::GetEnvForThread());
#endif
// The JIT need to be able to intercept faults, both for fastmem and for the BLR optimization. // The JIT need to be able to intercept faults, both for fastmem and for the BLR optimization.
const bool exception_handler = EMM::IsExceptionHandlerSupported(); const bool exception_handler = EMM::IsExceptionHandlerSupported();
if (exception_handler) if (exception_handler)