diff options
| author | bunnei <bunneidev@gmail.com> | 2020-08-31 21:20:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-31 21:20:08 -0400 |
| commit | 2579a7199b3ee8ad4bf65993a948612b32c3a89c (patch) | |
| tree | fa1e8ac00c89ba206f2a32486a26c49eea936488 | |
| parent | b5ed2d408c45720d88d47fd6fe79d7858edd4523 (diff) | |
| parent | 3dcaaa18be1cf60bd0447f1dff6e4fa1ad175cf9 (diff) | |
Merge pull request #4587 from yuzu-emu/tsan-microprofiler
externals/microprofile: Fix data race in g_bUseLock
| -rw-r--r-- | externals/microprofile/microprofile.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/externals/microprofile/microprofile.h b/externals/microprofile/microprofile.h index 6dae65a66..85d5bd5de 100644 --- a/externals/microprofile/microprofile.h +++ b/externals/microprofile/microprofile.h @@ -1037,7 +1037,7 @@ static void MicroProfileCreateThreadLogKey() #else MP_THREAD_LOCAL MicroProfileThreadLog* g_MicroProfileThreadLog = 0; #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); |