summaryrefslogtreecommitdiffstats
path: root/src/render/backend/renderer_p.h
diff options
context:
space:
mode:
authorMäättä Antti <antti.maatta@qt.io>2018-02-05 16:36:44 +0200
committerSean Harmer <sean.harmer@kdab.com>2018-02-06 10:22:17 +0000
commit13f340c92bdf725d214ab4840fc2e071d12d6e00 (patch)
tree9d2372537e274eb0127af0f85c9581a83836a8c6 /src/render/backend/renderer_p.h
parent564dfd87c5b1317dcf9fbc4d1c8d858c72513421 (diff)
Fix crash if sharecontext is requested before initailization
Scene2D can sometimes receive the render initialization event before the qt3d renderer has been initialized. This causes crash because the sharecontext hasn't been set yet. Add safeguard against this. Task-number: QT3DS-904 Change-Id: Ib50a60ed89c12ac54c9165266466d9804affe77c Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/backend/renderer_p.h')
-rw-r--r--src/render/backend/renderer_p.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/render/backend/renderer_p.h b/src/render/backend/renderer_p.h
index b18b78a7c..dc9f778dd 100644
--- a/src/render/backend/renderer_p.h
+++ b/src/render/backend/renderer_p.h
@@ -308,6 +308,7 @@ private:
QAtomicInt m_lastFrameCorrect;
QOpenGLContext *m_glContext;
QOpenGLContext *m_shareContext;
+ mutable QMutex m_shareContextMutex;
PickBoundingVolumeJobPtr m_pickBoundingVolumeJob;
qint64 m_time;