diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2018-08-27 18:02:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-27 18:02:59 +0200 |
| commit | f7b334817d0c200037cf3d86b6eb10f7f4b123ca (patch) | |
| tree | f3f0701b6e7744d95176587f9f23e426016ee9e8 /Source/Android | |
| parent | 88a91562b542f2066f14a0205aeea50f6d1d6125 (diff) | |
| parent | 7aa305ea358ee1574f1036493411aa2cdf86458f (diff) | |
Merge pull request #7371 from lioncash/global
Profiler: Migrate global g_ProfileBlocks to JitOptions
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index c5df6bfa29..a160786063 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -498,7 +498,8 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetProfiling std::lock_guard<std::mutex> guard(s_host_identity_lock); Core::SetState(Core::State::Paused); JitInterface::ClearCache(); - Profiler::g_ProfileBlocks = enable; + JitInterface::SetProfilingState(enable ? JitInterface::ProfilingState::Enabled : + JitInterface::ProfilingState::Disabled); Core::SetState(Core::State::Running); } |