summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2015-07-31 15:17:43 +0200
committerPaul Lemire <paul.lemire@kdab.com>2015-08-07 06:26:22 +0000
commitd81f86581da1c1d9b3f394472b3b1c88290c4062 (patch)
tree4f009819118c1eed9c45154060ee7358c7417ff8
parent669b86fd0154354b222f477a72f424441d222f35 (diff)
QResourceManager for RenderGeometry objects
Change-Id: I848cb20d20e59d3fa18c6336d3649e7ad810494d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--src/render/backend/handle_types_p.h2
-rw-r--r--src/render/backend/managers_p.h11
2 files changed, 13 insertions, 0 deletions
diff --git a/src/render/backend/handle_types_p.h b/src/render/backend/handle_types_p.h
index cbf31b24a..00afbb0db 100644
--- a/src/render/backend/handle_types_p.h
+++ b/src/render/backend/handle_types_p.h
@@ -73,6 +73,7 @@ class RenderShaderData;
class RenderTextureImage;
class RenderBuffer;
class RenderAttribute;
+class RenderGeometry;
typedef QHandle<RenderAttachment, 16> HAttachment;
typedef QHandle<RenderCameraLens, 8> HCamera;
@@ -100,6 +101,7 @@ typedef QHandle<RenderShaderData, 16> HShaderData;
typedef QHandle<RenderTextureImage, 16> HTextureImage;
typedef QHandle<RenderBuffer, 16> HBuffer;
typedef QHandle<RenderAttribute, 16> HAttribute;
+typedef QHandle<RenderGeometry, 16> HGeometry;
} // Render
diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h
index bb01b17c7..5da9daaf8 100644
--- a/src/render/backend/managers_p.h
+++ b/src/render/backend/managers_p.h
@@ -60,6 +60,7 @@
#include <Qt3DRenderer/private/rendertextureimage_p.h>
#include <Qt3DRenderer/private/renderbuffer_p.h>
#include <Qt3DRenderer/private/renderattribute_p.h>
+#include <Qt3DRenderer/private/rendergeometry_p.h>
QT_BEGIN_NAMESPACE
@@ -313,6 +314,15 @@ class AttributeManager : public QResourceManager<
{
};
+class GeometryManager : public QResourceManager<
+ RenderGeometry,
+ QNodeId,
+ 16,
+ Qt3D::ArrayAllocatingPolicy,
+ Qt3D::ObjectLevelLockingPolicy>
+{
+};
+
} // Render
Q_DECLARE_RESOURCE_INFO(Render::RenderAnnotation, Q_REQUIRES_CLEANUP);
@@ -330,6 +340,7 @@ Q_DECLARE_RESOURCE_INFO(Render::RenderRenderPass, Q_REQUIRES_CLEANUP);
Q_DECLARE_RESOURCE_INFO(Render::RenderTextureImage, Q_REQUIRES_CLEANUP);
Q_DECLARE_RESOURCE_INFO(Render::RenderBuffer, Q_REQUIRES_CLEANUP);
Q_DECLARE_RESOURCE_INFO(Render::RenderAttribute, Q_REQUIRES_CLEANUP);
+Q_DECLARE_RESOURCE_INFO(Render::RenderGeometry, Q_REQUIRES_CLEANUP);
} // Qt3D