yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Merge pull request #4587 from yuzu-emu/tsan-microprofiler 

externals/microprofile: Fix data race in g_bUseLock
This commit is contained in:
bunnei 2020-08-31 21:20:08 -04:00 committed by GitHub
parent b5ed2d408c 3dcaaa18be
commit 2579a7199b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
externals/microprofile/microprofile.h vendored
View File

@ -1037,7 +1037,7 @@ static void MicroProfileCreateThreadLogKey()
#else #else
MP_THREAD_LOCAL MicroProfileThreadLog* g_MicroProfileThreadLog = 0; MP_THREAD_LOCAL MicroProfileThreadLog* g_MicroProfileThreadLog = 0;
#endif #endif
static bool g_bUseLock = false; /// This is used because windows does not support using mutexes under dll init(which is where global initialization is handled) static std::atomic<bool> g_bUseLock{false}; /// This is used because windows does not support using mutexes under dll init(which is where global initialization is handled)
MICROPROFILE_DEFINE(g_MicroProfileFlip, "MicroProfile", "MicroProfileFlip", 0x3355ee); MICROPROFILE_DEFINE(g_MicroProfileFlip, "MicroProfile", "MicroProfileFlip", 0x3355ee);