diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2021-03-03 12:08:51 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2021-03-22 07:23:48 +0100 |
| commit | a536039d102f911677e5efec03cc6f3d701aceac (patch) | |
| tree | 4cea30ed5487d5f8079b5f15b2f36b1667b74390 /src | |
| parent | fe523229baceb6c597db9c16d508ba9bda14b1eb (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.
Pick-to: 6.0 6.1 5.15
Change-Id: Ic914f3b305bf807081294a90250413a5d263f124
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src')
| -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 001dcaaa3..dd1b3021d 100644 --- a/src/render/backend/managers_p.h +++ b/src/render/backend/managers_p.h @@ -202,7 +202,7 @@ public: class Q_3DRENDERSHARED_PRIVATE_EXPORT ShaderManager : public Qt3DCore::QResourceManager< Shader, Qt3DCore::QNodeId, - Qt3DCore::NonLockingPolicy> + Qt3DCore::ObjectLevelLockingPolicy> { public: ShaderManager() {} |