diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2021-03-03 12:08:51 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-04-30 08:23:20 +0000 |
| commit | 34d419486f5d0c95cbfdbf6bfeb8f3311c208b14 (patch) | |
| tree | ecb57330ec4b847b08c5dd2b6e24434c97ce7850 | |
| parent | 22509ec535e9c6883faa363c646b0ee1c1aa90e7 (diff) | |
Restore ObjectLevelLockingPolicy on ShaderManager
We are hitting a race condition otherwise. This is likely due to the fact
that removing the shaders is done only once we have unloaded them from the
graphics API which technically could happen in a separate thread than the
scenegraph thread when running with Scene3D.
Change-Id: Ic914f3b305bf807081294a90250413a5d263f124
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit a536039d102f911677e5efec03cc6f3d701aceac)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/render/backend/managers_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h index f13f8cb67..0d9b692f2 100644 --- a/src/render/backend/managers_p.h +++ b/src/render/backend/managers_p.h @@ -201,7 +201,7 @@ public: class Q_3DRENDERSHARED_PRIVATE_EXPORT ShaderManager : public Qt3DCore::QResourceManager< Shader, Qt3DCore::QNodeId, - Qt3DCore::NonLockingPolicy> + Qt3DCore::ObjectLevelLockingPolicy> { public: ShaderManager() {} |