diff options
Diffstat (limited to 'externals/microprofile/microprofileui.h')
| -rw-r--r-- | externals/microprofile/microprofileui.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/externals/microprofile/microprofileui.h b/externals/microprofile/microprofileui.h index eac1119a4..45bec8af6 100644 --- a/externals/microprofile/microprofileui.h +++ b/externals/microprofile/microprofileui.h | |||
| @@ -879,7 +879,7 @@ void MicroProfileDrawDetailedBars(uint32_t nWidth, uint32_t nHeight, int nBaseY, | |||
| 879 | static int64_t nRefCpu = 0, nRefGpu = 0; | 879 | static int64_t nRefCpu = 0, nRefGpu = 0; |
| 880 | if(MicroProfileGetGpuTickReference(&nTickReferenceCpu, &nTickReferenceGpu)) | 880 | if(MicroProfileGetGpuTickReference(&nTickReferenceCpu, &nTickReferenceGpu)) |
| 881 | { | 881 | { |
| 882 | if(0 == nRefCpu || abs(nRefCpu-nBaseTicksCpu) > abs(nTickReferenceCpu-nBaseTicksCpu)) | 882 | if(0 == nRefCpu || std::abs(nRefCpu-nBaseTicksCpu) > std::abs(nTickReferenceCpu-nBaseTicksCpu)) |
| 883 | { | 883 | { |
| 884 | nRefCpu = nTickReferenceCpu; | 884 | nRefCpu = nTickReferenceCpu; |
| 885 | nRefGpu = nTickReferenceGpu; | 885 | nRefGpu = nTickReferenceGpu; |
| @@ -1230,7 +1230,12 @@ void MicroProfileDrawDetailedBars(uint32_t nWidth, uint32_t nHeight, int nBaseY, | |||
| 1230 | char ThreadName[MicroProfileThreadLog::THREAD_MAX_LEN + 16]; | 1230 | char ThreadName[MicroProfileThreadLog::THREAD_MAX_LEN + 16]; |
| 1231 | const char* cLocal = MicroProfileIsLocalThread(nThreadId) ? "*": " "; | 1231 | const char* cLocal = MicroProfileIsLocalThread(nThreadId) ? "*": " "; |
| 1232 | 1232 | ||
| 1233 | #if defined(WIN32) | ||
| 1234 | // nThreadId is 32-bit on Windows | ||
| 1233 | int nStrLen = snprintf(ThreadName, sizeof(ThreadName)-1, "%04x: %s%s", nThreadId, cLocal, i < nNumThreadsBase ? &S.Pool[i]->ThreadName[0] : MICROPROFILE_THREAD_NAME_FROM_ID(nThreadId) ); | 1235 | int nStrLen = snprintf(ThreadName, sizeof(ThreadName)-1, "%04x: %s%s", nThreadId, cLocal, i < nNumThreadsBase ? &S.Pool[i]->ThreadName[0] : MICROPROFILE_THREAD_NAME_FROM_ID(nThreadId) ); |
| 1236 | #else | ||
| 1237 | int nStrLen = snprintf(ThreadName, sizeof(ThreadName)-1, "%04llx: %s%s", nThreadId, cLocal, i < nNumThreadsBase ? &S.Pool[i]->ThreadName[0] : MICROPROFILE_THREAD_NAME_FROM_ID(nThreadId) ); | ||
| 1238 | #endif | ||
| 1234 | uint32_t nThreadColor = -1; | 1239 | uint32_t nThreadColor = -1; |
| 1235 | if(nThreadId == nContextSwitchHoverThreadAfter || nThreadId == nContextSwitchHoverThreadBefore) | 1240 | if(nThreadId == nContextSwitchHoverThreadAfter || nThreadId == nContextSwitchHoverThreadBefore) |
| 1236 | nThreadColor = UI.nHoverColorShared|0x906060; | 1241 | nThreadColor = UI.nHoverColorShared|0x906060; |