diff options
| author |  Mat M | 2020-03-18 20:09:32 -0400 |
|---|---|---|
| committer |  GitHub | 2020-03-18 20:09:32 -0400 |
| commit | 9418b983bd400aa8d1cd149655edccd488426f0e (patch) | |
| tree | a3eaa1d90557b089128b2e7c58624434decbc9f9 /externals | |
| parent | Merge pull request #3534 from ReinUsesLisp/oob-time-zone (diff) | |
| parent | vk_texture_cache: Silence misc warnings (diff) | |
| download | yuzu-9418b983bd400aa8d1cd149655edccd488426f0e.tar.gz yuzu-9418b983bd400aa8d1cd149655edccd488426f0e.tar.xz yuzu-9418b983bd400aa8d1cd149655edccd488426f0e.zip | |
Merge pull request #3535 from ReinUsesLisp/gcc-warnings
video_core: Silence misc warnings
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 | |||
| 828 | MicroProfileLogEntry Entry = (nBegin<<62) | ((0x3fff&nToken)<<48) | (MP_LOG_TICK_MASK&nTick); | 828 | MicroProfileLogEntry Entry = (nBegin<<62) | ((0x3fff&nToken)<<48) | (MP_LOG_TICK_MASK&nTick); |
| 829 | int t = MicroProfileLogType(Entry); | 829 | int t = MicroProfileLogType(Entry); |
| 830 | uint64_t nTimerIndex = MicroProfileLogTimerIndex(Entry); | 830 | uint64_t nTimerIndex = MicroProfileLogTimerIndex(Entry); |
| 831 | MP_ASSERT(t == nBegin); | 831 | MP_ASSERT((uint64_t)t == nBegin); |
| 832 | MP_ASSERT(nTimerIndex == (nToken&0x3fff)); | 832 | MP_ASSERT(nTimerIndex == (nToken&0x3fff)); |
| 833 | return Entry; | 833 | return Entry; |
| 834 | 834 | ||
| @@ -1556,10 +1556,10 @@ void MicroProfileFlip() | |||
| 1556 | 1556 | ||
| 1557 | pFramePut->nFrameStartCpu = MP_TICK(); | 1557 | pFramePut->nFrameStartCpu = MP_TICK(); |
| 1558 | pFramePut->nFrameStartGpu = (uint32_t)MicroProfileGpuInsertTimeStamp(); | 1558 | pFramePut->nFrameStartGpu = (uint32_t)MicroProfileGpuInsertTimeStamp(); |
| 1559 | if(pFrameNext->nFrameStartGpu != (uint64_t)-1) | 1559 | if(pFrameNext->nFrameStartGpu != -1) |
| 1560 | pFrameNext->nFrameStartGpu = MicroProfileGpuGetTimeStamp((uint32_t)pFrameNext->nFrameStartGpu); | 1560 | pFrameNext->nFrameStartGpu = MicroProfileGpuGetTimeStamp((uint32_t)pFrameNext->nFrameStartGpu); |
| 1561 | 1561 | ||
| 1562 | if(pFrameCurrent->nFrameStartGpu == (uint64_t)-1) | 1562 | if(pFrameCurrent->nFrameStartGpu == -1) |
| 1563 | pFrameCurrent->nFrameStartGpu = pFrameNext->nFrameStartGpu + 1; | 1563 | pFrameCurrent->nFrameStartGpu = pFrameNext->nFrameStartGpu + 1; |
| 1564 | 1564 | ||
| 1565 | uint64_t nFrameStartCpu = pFrameCurrent->nFrameStartCpu; | 1565 | uint64_t nFrameStartCpu = pFrameCurrent->nFrameStartCpu; |