diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index b1a1247b44..646f12708e 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp @@ -56,9 +56,7 @@ CoreTiming::~CoreTiming() { void CoreTiming::ThreadEntry(CoreTiming& instance) { static constexpr char name[] = "HostTiming"; -#if MICROPROFILE_ENABLED MicroProfileOnThreadCreate(name); -#endif Common::SetCurrentThreadName(name); Common::SetCurrentThreadPriority(Common::ThreadPriority::High); instance.on_thread_init(); diff --git a/src/core/cpu_manager.cpp b/src/core/cpu_manager.cpp index 1ee4e96002..1b838eea59 100644 --- a/src/core/cpu_manager.cpp +++ b/src/core/cpu_manager.cpp @@ -192,9 +192,7 @@ void CpuManager::RunThread(std::stop_token token, std::size_t core) { } else { name = "CPUThread"; } -#if MICROPROFILE_ENABLED MicroProfileOnThreadCreate(name.c_str()); -#endif Common::SetCurrentThreadName(name.c_str()); Common::SetCurrentThreadPriority(Common::ThreadPriority::Critical); auto& data = core_data[core]; diff --git a/src/video_core/fence_manager.h b/src/video_core/fence_manager.h index 1a9fdde4ab..b2306678cf 100644 --- a/src/video_core/fence_manager.h +++ b/src/video_core/fence_manager.h @@ -219,9 +219,11 @@ private: MicroProfileOnThreadCreate(name.c_str()); // Cleanup +#if MICROPROFILE_ENABLED SCOPE_EXIT { MicroProfileOnThreadExit(); }; +#endif Common::SetCurrentThreadName(name.c_str()); Common::SetCurrentThreadPriority(Common::ThreadPriority::High);