diff options
author | Jari Karppinen <jari.karppinen@qt.io> | 2019-05-28 13:17:46 +0300 |
---|---|---|
committer | Jari Karppinen <jari.karppinen@qt.io> | 2019-05-31 17:35:09 +0300 |
commit | 2fb4a493fd1b8d6e16ad22fb2ffd1caa08bdafdf (patch) | |
tree | 995a26af79cf7e3b53e7c7bb35973eb3b2e92c10 | |
parent | 3d2630a0f36dc664a7dde671ae7f660cad77b317 (diff) |
Remove Linux specific hacks in subpresentation update
Task-number: QT3DS-3522
Change-Id: I09916189ab4a2025e4c1944b92a295666a7a5dbf
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r-- | src/Authoring/Studio/Render/StudioSubPresentationRenderer.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/Authoring/Studio/Render/StudioSubPresentationRenderer.cpp b/src/Authoring/Studio/Render/StudioSubPresentationRenderer.cpp index 76e5f3c3..b04233cd 100644 --- a/src/Authoring/Studio/Render/StudioSubPresentationRenderer.cpp +++ b/src/Authoring/Studio/Render/StudioSubPresentationRenderer.cpp @@ -119,17 +119,8 @@ public: m_running = true; m_semaphore.release(); -#ifdef Q_OS_LINUX - // TODO: Updating the subpresentation on loop crashes or hangs on Linux, this hack fixes - // it for now - m_surfaceViewer->update(); -#endif - m_context->doneCurrent(); -#ifndef Q_OS_LINUX - // TODO: Updating the subpresentation on loop crashes or hangs on Linux, this hack fixes - // it for now while (true) { QMutexLocker lock(&m_mutex); if (!m_running) @@ -152,7 +143,6 @@ public: m_fbo.reset(); m_context->doneCurrent(); m_context.reset(); -#endif m_surfaceViewer->destroy(); m_surfaceViewer.reset(); m_surface->moveToThread(m_mainThread); |