summaryrefslogtreecommitdiffstats
path: root/src/render/backend/nodemanagers_p.h
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2019-06-04 06:33:13 +0200
committerPaul Lemire <paul.lemire@kdab.com>2019-06-05 10:30:44 +0200
commit73177e934cb07de9d1bf7fbb0b72bb765b7bd5e1 (patch)
treebc214f9f68399decc9818683224dab3dab346220 /src/render/backend/nodemanagers_p.h
parentdad524256b61ef17e5f9843167cdfa757ac4e184 (diff)
Register QShaderImage in QRenderAspect
And add required ShaderImageManager Change-Id: I4b3347d6dc4b70690abea0486c933f5a508b057f Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Michael Brasser <michael.brasser@live.com>
Diffstat (limited to 'src/render/backend/nodemanagers_p.h')
-rw-r--r--src/render/backend/nodemanagers_p.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/render/backend/nodemanagers_p.h b/src/render/backend/nodemanagers_p.h
index 46e7b60f1..7cc1f2ac2 100644
--- a/src/render/backend/nodemanagers_p.h
+++ b/src/render/backend/nodemanagers_p.h
@@ -105,6 +105,7 @@ class RenderStateManager;
class ArmatureManager;
class SkeletonManager;
class JointManager;
+class ShaderImageManager;
class FrameGraphNode;
class Entity;
@@ -143,6 +144,7 @@ class Armature;
class Skeleton;
class Joint;
class OpenGLVertexArrayObject;
+class ShaderImage;
class ResourceAccessor;
@@ -225,6 +227,7 @@ public:
inline ArmatureManager *armatureManager() const Q_DECL_NOEXCEPT { return m_armatureManager; }
inline SkeletonManager *skeletonManager() const Q_DECL_NOEXCEPT { return m_skeletonManager; }
inline JointManager *jointManager() const Q_DECL_NOEXCEPT { return m_jointManager; }
+ inline ShaderImageManager *shaderImageManager() const Q_DECL_NOEXCEPT { return m_shaderImageManager; }
QSharedPointer<ResourceAccessor> resourceAccessor();
@@ -268,6 +271,7 @@ private:
ArmatureManager *m_armatureManager;
SkeletonManager *m_skeletonManager;
JointManager *m_jointManager;
+ ShaderImageManager *m_shaderImageManager;
QSharedPointer<ResourceAccessor> m_resourceAccessor;
};
@@ -385,6 +389,9 @@ Q_3DRENDERSHARED_PRIVATE_EXPORT SkeletonManager *NodeManagers::manager<Skeleton>
template<>
Q_3DRENDERSHARED_PRIVATE_EXPORT JointManager *NodeManagers::manager<Joint>() const Q_DECL_NOEXCEPT;
+template<>
+Q_3DRENDERSHARED_PRIVATE_EXPORT ShaderImageManager *NodeManagers::manager<ShaderImage>() const Q_DECL_NOEXCEPT;
+
} // Render
} // Qt3DRender