diff options
| author | Andy Nichols <andy.nichols@qt.io> | 2019-05-24 11:40:06 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2019-05-24 10:26:31 +0000 |
| commit | b2a799a2d4a308a7b28f50ed4c70a003b023546d (patch) | |
| tree | e519d0467b542944e4a6d642f7cb53163e340101 | |
| parent | 9456f4b6cefc47a4162e1f77eb5b030f5f0a1d16 (diff) | |
Use pointer instead of reference in Qt3DSRenderThreadPool
This is to work around a compiler bug in Integrity
Change-Id: Ie2511e3a7be081cca161efa246da3fe35c28489a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| -rw-r--r-- | src/Runtime/Source/runtimerender/Qt3DSRenderThreadPool.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderThreadPool.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderThreadPool.cpp index 70499c62..3e0cdb36 100644 --- a/src/Runtime/Source/runtimerender/Qt3DSRenderThreadPool.cpp +++ b/src/Runtime/Source/runtimerender/Qt3DSRenderThreadPool.cpp @@ -110,8 +110,8 @@ public: struct SThreadPoolThread : public Thread { - IInternalTaskManager &m_Mgr; - SThreadPoolThread(NVFoundationBase &foundation, IInternalTaskManager &inMgr) + IInternalTaskManager *m_Mgr; + SThreadPoolThread(NVFoundationBase &foundation, IInternalTaskManager *inMgr) : Thread(foundation) , m_Mgr(inMgr) { @@ -120,10 +120,10 @@ struct SThreadPoolThread : public Thread { setName("Qt3DSRender Thread manager thread"); while (!quitIsSignalled()) { - STask task = m_Mgr.GetNextTask(); + STask task = m_Mgr->GetNextTask(); if (task.m_Function) { task.CallFunction(); - m_Mgr.TaskFinished(task.m_Id); + m_Mgr->TaskFinished(task.m_Id); } } quit(); @@ -162,7 +162,7 @@ struct SThreadPool : public IThreadPool, public IInternalTaskManager // Fire up our little pools of chaos. for (QT3DSU32 idx = 0; idx < inMaxThreads; ++idx) { m_Threads.push_back( - QT3DS_NEW(m_Foundation.getAllocator(), SThreadPoolThread)(m_Foundation, *this)); + QT3DS_NEW(m_Foundation.getAllocator(), SThreadPoolThread)(m_Foundation, this)); m_Threads.back()->start(Thread::DEFAULT_STACK_SIZE); } } |