diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-02-06 14:24:48 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-02-06 14:24:48 +0000 |
| commit | d01b296f5d3bf5bb5355a868c4f7eeba051c2d23 (patch) | |
| tree | ad83da26bdcf21bf686157bc773a237ec7a83da4 /src/render/backend/managers_p.h | |
| parent | faa8fc18bfeca06de6c4a7bdbb14e1be9eb96f54 (diff) | |
| parent | f865508efd13cae9d09c425d0e419f81057f1948 (diff) | |
Merge branch '5.8' into 5.9
Conflicts:
src/core/nodes/qnode.cpp
Change-Id: Id989bec6c54eee94651906d44ece752c10b7d0d1
Diffstat (limited to 'src/render/backend/managers_p.h')
| -rw-r--r-- | src/render/backend/managers_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h index d9e46db45..a75c27b25 100644 --- a/src/render/backend/managers_p.h +++ b/src/render/backend/managers_p.h @@ -261,7 +261,7 @@ public: class VAOManager : public Qt3DCore::QResourceManager< OpenGLVertexArrayObject, - QPair<HGeometry, HShader>, + VAOIdentifier, 16, Qt3DCore::ArrayAllocatingPolicy, Qt3DCore::NonLockingPolicy> @@ -432,6 +432,7 @@ Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::BoundingVolumeDebug, Q_REQUIRES_CLEA Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::ComputeCommand, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Parameter, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Transform, Q_REQUIRES_CLEANUP) +Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::OpenGLVertexArrayObject, Q_REQUIRES_CLEANUP) QT_END_NAMESPACE |