summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2015-01-29 14:29:05 +0100
committerSean Harmer <sean.harmer@kdab.com>2015-02-08 15:02:10 +0000
commit616c1456271c9bb9cb510987409b71d52c019b4d (patch)
treebcaf3cc57118c8ba02e63dad9ff895b8006d7df4
parent8adbf92c87eec71a22611124b494ac9acfb454ff (diff)
TextureImageManager for RenderTextureImage
Change-Id: I3a751d3357606951cc90176b6c48c4684e4f560f 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 f4c7c6d4d..9dadc4c23 100644
--- a/src/render/backend/handle_types_p.h
+++ b/src/render/backend/handle_types_p.h
@@ -75,6 +75,7 @@ class RenderTarget;
class RenderRenderPass;
class RenderParameter;
class RenderShaderData;
+class RenderTextureImage;
typedef QHandle<RenderAttachment, 16> HAttachment;
typedef QHandle<RenderCameraLens, 8> HCamera;
@@ -99,6 +100,7 @@ typedef QHandle<RenderRenderPass, 16> HRenderPass;
typedef QHandle<TexImageData, 16> HTextureData;
typedef QHandle<RenderParameter, 16> HParameter;
typedef QHandle<RenderShaderData, 16> HShaderData;
+typedef QHandle<RenderTextureImage, 16> HTextureImage;
} // Render
diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h
index 3aa1990dd..08f444c15 100644
--- a/src/render/backend/managers_p.h
+++ b/src/render/backend/managers_p.h
@@ -62,6 +62,7 @@
#include <Qt3DRenderer/private/rendershaderdata_p.h>
#include <Qt3DRenderer/private/handle_types_p.h>
#include <Qt3DRenderer/private/uniformbuffer_p.h>
+#include <Qt3DRenderer/private/rendertextureimage_p.h>
QT_BEGIN_NAMESPACE
@@ -288,6 +289,15 @@ class UBOManager : public QResourceManager<
{
};
+class TextureImageManager : public QResourceManager<
+ RenderTextureImage,
+ QNodeId,
+ 16,
+ Qt3D::ArrayAllocatingPolicy,
+ Qt3D::ObjectLevelLockingPolicy>
+{
+};
+
} // Render
Q_DECLARE_RESOURCE_INFO(Render::RenderAnnotation, Q_REQUIRES_CLEANUP);
@@ -302,6 +312,7 @@ Q_DECLARE_RESOURCE_INFO(Render::RenderTarget, Q_REQUIRES_CLEANUP);
Q_DECLARE_RESOURCE_INFO(Render::RenderTechnique, Q_REQUIRES_CLEANUP);
Q_DECLARE_RESOURCE_INFO(Render::RenderTexture, Q_REQUIRES_CLEANUP);
Q_DECLARE_RESOURCE_INFO(Render::RenderRenderPass, Q_REQUIRES_CLEANUP);
+Q_DECLARE_RESOURCE_INFO(Render::RenderTextureImage, Q_REQUIRES_CLEANUP);
} // Qt3D