diff options
| author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-03-18 21:02:55 +0100 |
|---|---|---|
| committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-03-19 00:03:19 +0100 |
| commit | ba9674862de3e537b35bdb4d4c245ea7a247eb2f (patch) | |
| tree | 5ee8d4b8a3005ec6cd2e37ebe4cac3713a08140d /externals | |
| parent | Merge pull request #3530 from ReinUsesLisp/fix-clang (diff) | |
| download | yuzu-ba9674862de3e537b35bdb4d4c245ea7a247eb2f.tar yuzu-ba9674862de3e537b35bdb4d4c245ea7a247eb2f.tar.gz yuzu-ba9674862de3e537b35bdb4d4c245ea7a247eb2f.tar.bz2 yuzu-ba9674862de3e537b35bdb4d4c245ea7a247eb2f.tar.lz yuzu-ba9674862de3e537b35bdb4d4c245ea7a247eb2f.tar.xz yuzu-ba9674862de3e537b35bdb4d4c245ea7a247eb2f.tar.zst yuzu-ba9674862de3e537b35bdb4d4c245ea7a247eb2f.zip | |
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/microprofile/microprofile.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/externals/microprofile/microprofile.h b/externals/microprofile/microprofile.h index c1556d10c..9d830f7bf 100644 --- a/externals/microprofile/microprofile.h +++ b/externals/microprofile/microprofile.h @@ -828,7 +828,7 @@ inline MicroProfileLogEntry MicroProfileMakeLogIndex(uint64_t nBegin, MicroProfi MicroProfileLogEntry Entry = (nBegin<<62) | ((0x3fff&nToken)<<48) | (MP_LOG_TICK_MASK&nTick); int t = MicroProfileLogType(Entry); uint64_t nTimerIndex = MicroProfileLogTimerIndex(Entry); - MP_ASSERT(t == nBegin); + MP_ASSERT((uint64_t)t == nBegin); MP_ASSERT(nTimerIndex == (nToken&0x3fff)); return Entry; @@ -1556,10 +1556,10 @@ void MicroProfileFlip() pFramePut->nFrameStartCpu = MP_TICK(); pFramePut->nFrameStartGpu = (uint32_t)MicroProfileGpuInsertTimeStamp(); - if(pFrameNext->nFrameStartGpu != (uint64_t)-1) + if(pFrameNext->nFrameStartGpu != -1) pFrameNext->nFrameStartGpu = MicroProfileGpuGetTimeStamp((uint32_t)pFrameNext->nFrameStartGpu); - if(pFrameCurrent->nFrameStartGpu == (uint64_t)-1) + if(pFrameCurrent->nFrameStartGpu == -1) pFrameCurrent->nFrameStartGpu = pFrameNext->nFrameStartGpu + 1; uint64_t nFrameStartCpu = pFrameCurrent->nFrameStartCpu; |