diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2015-08-04 17:37:50 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-08-07 14:32:03 +0000 |
| commit | 8e6652961adffb888602774c679ee756737a8b40 (patch) | |
| tree | 3941c836a87adcf0370145ab95ac8051c275b30c /src/render/backend/managers_p.h | |
| parent | 975624820bbb086f0d7957236128ddb043e792d0 (diff) | |
Rework Renderer to use BufferFunctor
Each buffer when it receives a new functor adds itself with the buffer
manager. This then allows to build LoadBufferJob instances for each buffer to
be loaded. The buffers can then be loaded before a frame is rendered.
The GeometryRendererManager has been moved back with other managers and the
BufferManager takes its place to handle the additional management of dirty
buffers.
Renderer updated accordingly.
Change-Id: I5df839b56d18de077e1ff2921cb481ed8f613567
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/backend/managers_p.h')
| -rw-r--r-- | src/render/backend/managers_p.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h index 5afe57390..b0a8cc8b4 100644 --- a/src/render/backend/managers_p.h +++ b/src/render/backend/managers_p.h @@ -58,9 +58,9 @@ #include <Qt3DRenderer/private/handle_types_p.h> #include <Qt3DRenderer/private/uniformbuffer_p.h> #include <Qt3DRenderer/private/rendertextureimage_p.h> -#include <Qt3DRenderer/private/renderbuffer_p.h> #include <Qt3DRenderer/private/renderattribute_p.h> #include <Qt3DRenderer/private/rendergeometry_p.h> +#include <Qt3DRenderer/private/rendergeometryrenderer_p.h> QT_BEGIN_NAMESPACE @@ -296,8 +296,8 @@ class TextureImageManager : public QResourceManager< { }; -class BufferManager : public QResourceManager< - RenderBuffer, +class AttributeManager : public QResourceManager< + RenderAttribute, QNodeId, 16, Qt3D::ArrayAllocatingPolicy, @@ -305,8 +305,8 @@ class BufferManager : public QResourceManager< { }; -class AttributeManager : public QResourceManager< - RenderAttribute, +class GeometryManager : public QResourceManager< + RenderGeometry, QNodeId, 16, Qt3D::ArrayAllocatingPolicy, @@ -314,8 +314,8 @@ class AttributeManager : public QResourceManager< { }; -class GeometryManager : public QResourceManager< - RenderGeometry, +class GeometryRendererManager : public QResourceManager< + RenderGeometryRenderer, QNodeId, 16, Qt3D::ArrayAllocatingPolicy, @@ -338,9 +338,9 @@ 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); -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); +Q_DECLARE_RESOURCE_INFO(Render::RenderGeometryRenderer, Q_REQUIRES_CLEANUP); } // Qt3D |