Managers: use the non locking policy

In most cases, actually creation/deletion is happening in the aspect thread
when the changes are synched with the frontend. The jobs perform only lookups
so enforcing the ObjectLevelLockingPolicy is not that useful

Change-Id: Ib6e05d4bca76f30205dd59dae743e1d0d9029ec1
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

1 files changed, 35 insertions, 25 deletions

diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h
index 8d922c0d1..fbd5ae6c4 100644
--- a/src/render/backend/managers_p.h
+++ b/src/render/backend/managers_p.h
@@ -90,7 +90,7 @@ class AttachmentManager : public Qt3DCore::QResourceManager<
         Qt3DCore::QNodeId,
         16,
         Qt3DCore::ArrayAllocatingPolicy,
-        Qt3DCore::ObjectLevelLockingPolicy>
+        Qt3DCore::NonLockingPolicy>
 {
 public:
     AttachmentManager() {}
@@ -100,7 +100,8 @@ class CameraManager : public Qt3DCore::QResourceManager<
         CameraLens,
         Qt3DCore::QNodeId,
         8,
-        Qt3DCore::ArrayAllocatingPolicy>
+        Qt3DCore::ArrayAllocatingPolicy,
+        Qt3DCore::NonLockingPolicy>
 {
 public:
     CameraManager() {}
@@ -111,7 +112,7 @@ class FilterKeyManager : public Qt3DCore::QResourceManager<
         Qt3DCore::QNodeId,
         16,
         Qt3DCore::ArrayAllocatingPolicy,
-        Qt3DCore::ObjectLevelLockingPolicy>
+        Qt3DCore::NonLockingPolicy>
 
 {
 public:
@@ -123,7 +124,7 @@ class EffectManager : public Qt3DCore::QResourceManager<
         Qt3DCore::QNodeId,
         16,
         Qt3DCore::ArrayAllocatingPolicy,
-        Qt3DCore::ObjectLevelLockingPolicy>
+        Qt3DCore::NonLockingPolicy>
 {
 public:
     EffectManager() {}
@@ -132,7 +133,9 @@ public:
 class Q_AUTOTEST_EXPORT EntityManager : public Qt3DCore::QResourceManager<
         Entity,
         Qt3DCore::QNodeId,
-        16>
+        16,
+        Qt3DCore::ArrayAllocatingPolicy,
+        Qt3DCore::NonLockingPolicy>
 {
 public:
     EntityManager() {}
@@ -168,7 +171,7 @@ class LayerManager : public Qt3DCore::QResourceManager<
         Qt3DCore::QNodeId,
         16,
         Qt3DCore::ArrayAllocatingPolicy,
-        Qt3DCore::ObjectLevelLockingPolicy>
+        Qt3DCore::NonLockingPolicy>
 {
 public:
     LayerManager() {}
@@ -179,13 +182,18 @@ class MaterialManager : public Qt3DCore::QResourceManager<
         Qt3DCore::QNodeId,
         16,
         Qt3DCore::ArrayAllocatingPolicy,
-        Qt3DCore::ObjectLevelLockingPolicy>
+        Qt3DCore::NonLockingPolicy>
 {
 public:
     MaterialManager() {}
 };
 
-class MatrixManager : public Qt3DCore::QResourceManager<QMatrix4x4, Qt3DCore::QNodeId, 16>
+class MatrixManager : public Qt3DCore::QResourceManager<
+        QMatrix4x4,
+        Qt3DCore::QNodeId,
+        16,
+        Qt3DCore::ArrayAllocatingPolicy,
+        Qt3DCore::NonLockingPolicy>
 {
 public:
     MatrixManager() {}
@@ -196,7 +204,7 @@ class ShaderManager : public Qt3DCore::QResourceManager<
         Qt3DCore::QNodeId,
         16,
         Qt3DCore::ArrayAllocatingPolicy,
-        Qt3DCore::ObjectLevelLockingPolicy>
+        Qt3DCore::NonLockingPolicy>
 {
 public:
     ShaderManager() {}
@@ -207,7 +215,7 @@ class TechniqueManager : public Qt3DCore::QResourceManager<
         Qt3DCore::QNodeId,
         16,
         Qt3DCore::ArrayAllocatingPolicy,
-        Qt3DCore::ObjectLevelLockingPolicy>
+        Qt3DCore::NonLockingPolicy>
 {
 public:
     TechniqueManager() {}
@@ -218,7 +226,7 @@ class TextureManager : public Qt3DCore::QResourceManager<
         Qt3DCore::QNodeId,
         16,
         Qt3DCore::ArrayAllocatingPolicy,
-        Qt3DCore::ObjectLevelLockingPolicy>
+        Qt3DCore::NonLockingPolicy>
 {
 public:
     TextureManager() {}
@@ -229,7 +237,7 @@ class TransformManager : public Qt3DCore::QResourceManager<
         Qt3DCore::QNodeId,
         16,
         Qt3DCore::ArrayAllocatingPolicy,
-        Qt3DCore::ObjectLevelLockingPolicy>
+        Qt3DCore::NonLockingPolicy>
 {
 public:
     TransformManager() {}
@@ -238,7 +246,9 @@ public:
 class VAOManager : public Qt3DCore::QResourceManager<
         OpenGLVertexArrayObject,
         QPair<HGeometry, HShader>,
-        16>
+        16,
+        Qt3DCore::ArrayAllocatingPolicy,
+        Qt3DCore::NonLockingPolicy>
 {
 public:
     VAOManager() {}
@@ -249,7 +259,7 @@ class RenderTargetManager : public Qt3DCore::QResourceManager<
         Qt3DCore::QNodeId,
         8,
         Qt3DCore::ArrayAllocatingPolicy,
-        Qt3DCore::ObjectLevelLockingPolicy>
+        Qt3DCore::NonLockingPolicy>
 {
 public:
     RenderTargetManager() {}
@@ -260,7 +270,7 @@ class RenderPassManager : public Qt3DCore::QResourceManager<
         Qt3DCore::QNodeId,
         16,
         Qt3DCore::ArrayAllocatingPolicy,
-        Qt3DCore::ObjectLevelLockingPolicy>
+        Qt3DCore::NonLockingPolicy>
 {
 public:
     RenderPassManager() {}
@@ -272,7 +282,7 @@ class ParameterManager : public Qt3DCore::QResourceManager<
         Qt3DCore::QNodeId,
         16,
         Qt3DCore::ArrayAllocatingPolicy,
-        Qt3DCore::ObjectLevelLockingPolicy>
+        Qt3DCore::NonLockingPolicy>
 {
 public:
     ParameterManager() {}
@@ -283,7 +293,7 @@ class ShaderDataManager : public Qt3DCore::QResourceManager<
         Qt3DCore::QNodeId,
         16,
         Qt3DCore::ArrayAllocatingPolicy,
-        Qt3DCore::ObjectLevelLockingPolicy>
+        Qt3DCore::NonLockingPolicy>
 {
 public:
     ShaderDataManager() {}
@@ -294,7 +304,7 @@ class GLBufferManager : public Qt3DCore::QResourceManager<
         Qt3DCore::QNodeId,
         16,
         Qt3DCore::ArrayAllocatingPolicy,
-        Qt3DCore::ObjectLevelLockingPolicy>
+        Qt3DCore::NonLockingPolicy>
 {
 };
 
@@ -303,7 +313,7 @@ class TextureImageManager : public Qt3DCore::QResourceManager<
         Qt3DCore::QNodeId,
         16,
         Qt3DCore::ArrayAllocatingPolicy,
-        Qt3DCore::ObjectLevelLockingPolicy>
+        Qt3DCore::NonLockingPolicy>
 {
 };
 
@@ -312,7 +322,7 @@ class AttributeManager : public Qt3DCore::QResourceManager<
         Qt3DCore::QNodeId,
         20,
         Qt3DCore::ArrayAllocatingPolicy,
-        Qt3DCore::ObjectLevelLockingPolicy>
+        Qt3DCore::NonLockingPolicy>
 {
 };
 
@@ -321,7 +331,7 @@ class GeometryManager : public Qt3DCore::QResourceManager<
         Qt3DCore::QNodeId,
         16,
         Qt3DCore::ArrayAllocatingPolicy,
-        Qt3DCore::ObjectLevelLockingPolicy>
+        Qt3DCore::NonLockingPolicy>
 {
 };
 
@@ -330,7 +340,7 @@ class ObjectPickerManager : public Qt3DCore::QResourceManager<
         Qt3DCore::QNodeId,
         16,
         Qt3DCore::ArrayAllocatingPolicy,
-        Qt3DCore::ObjectLevelLockingPolicy>
+        Qt3DCore::NonLockingPolicy>
 {
 };
 
@@ -350,7 +360,7 @@ class LightManager : public Qt3DCore::QResourceManager<
         Qt3DCore::QNodeId,
         16,
         Qt3DCore::ArrayAllocatingPolicy,
-        Qt3DCore::ObjectLevelLockingPolicy>
+        Qt3DCore::NonLockingPolicy>
 {
 public:
     LightManager() {}
@@ -361,7 +371,7 @@ class ComputeCommandManager : public Qt3DCore::QResourceManager<
         Qt3DCore::QNodeId,
         16,
         Qt3DCore::ArrayAllocatingPolicy,
-        Qt3DCore::ObjectLevelLockingPolicy>
+        Qt3DCore::NonLockingPolicy>
 {
 public:
     ComputeCommandManager() {}
@@ -372,7 +382,7 @@ class RenderStateManager : public Qt3DCore::QResourceManager<
         Qt3DCore::QNodeId,
         16,
         Qt3DCore::ArrayAllocatingPolicy,
-        Qt3DCore::ObjectLevelLockingPolicy>
+        Qt3DCore::NonLockingPolicy>
 {
 };