diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2020-01-15 19:09:24 +0200 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2020-01-15 19:09:24 +0200 |
| commit | 5aedae5aa9251e1216d7bc1652cb1f451dd047c1 (patch) | |
| tree | 1e3c00ccac6cb4082d8bd3e52f047f8cbc058b61 /src/render/services/vsyncframeadvanceservice.cpp | |
| parent | 532e108a3abf56aa0ef709af5049ce3b2161ed84 (diff) | |
| parent | df5a63b059956e8a717db9110327cc86612cc934 (diff) | |
Merge 5.14 into 5.14.1v5.14.1
Change-Id: Ia93046662955494eccd3f4da80f015fe5148b026
Diffstat (limited to 'src/render/services/vsyncframeadvanceservice.cpp')
| -rw-r--r-- | src/render/services/vsyncframeadvanceservice.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/render/services/vsyncframeadvanceservice.cpp b/src/render/services/vsyncframeadvanceservice.cpp index d7398e2ce..662c12e4e 100644 --- a/src/render/services/vsyncframeadvanceservice.cpp +++ b/src/render/services/vsyncframeadvanceservice.cpp @@ -80,12 +80,7 @@ qint64 VSyncFrameAdvanceService::waitForNextFrame() { Q_D(VSyncFrameAdvanceService); -#ifdef Q_OS_MACOS - if (!d->m_semaphore.tryAcquire(std::max(d->m_semaphore.available(), 1), 4)) - return -1; -#else d->m_semaphore.acquire(std::max(d->m_semaphore.available(), 1)); -#endif const qint64 currentTime = d->m_elapsed.nsecsElapsed(); qCDebug(VSyncAdvanceService) << "Elapsed nsecs since last call " << currentTime - d->m_elapsedTimeSincePreviousFrame; |