Move GeometryRenderManager to its own file

This is needed to add logic for geometry functors that needs to be loaded.

Change-Id: I06e59447c41ea8e08cfdb77fc94084837afebeac
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

7 files changed, 135 insertions, 13 deletions

diff --git a/src/render/backend/geometryrenderermanager.cpp b/src/render/backend/geometryrenderermanager.cpp
new file mode 100644
index 000000000..ffefe7141
--- /dev/null
+++ b/src/render/backend/geometryrenderermanager.cpp
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Paul Lemire
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "geometryrenderermanager_p.h"
+
+QT_BEGIN_NAMESPACE
+
+namespace Qt3D {
+
+
+namespace Render {
+
+GeometryRendererManager::GeometryRendererManager()
+{
+}
+
+GeometryRendererManager::~GeometryRendererManager()
+{
+}
+
+} // Render
+
+} // Qt3D
+
+QT_END_NAMESPACE
diff --git a/src/render/backend/geometryrenderermanager_p.h b/src/render/backend/geometryrenderermanager_p.h
new file mode 100644
index 000000000..cbeb5c6c4
--- /dev/null
+++ b/src/render/backend/geometryrenderermanager_p.h
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Paul Lemire
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QT3D_RENDER_GEOMETRYRENDERERMANAGER_H
+#define QT3D_RENDER_GEOMETRYRENDERERMANAGER_H
+
+#include <Qt3DCore/private/qresourcemanager_p.h>
+#include <Qt3DRenderer/private/rendergeometryrenderer_p.h>
+
+QT_BEGIN_NAMESPACE
+
+namespace Qt3D {
+
+namespace Render {
+
+class GeometryRendererManager : public QResourceManager<
+        RenderGeometryRenderer,
+        QNodeId,
+        16,
+        Qt3D::ArrayAllocatingPolicy,
+        Qt3D::ObjectLevelLockingPolicy>
+{
+public:
+    GeometryRendererManager();
+    ~GeometryRendererManager();
+};
+
+} // Render
+
+Q_DECLARE_RESOURCE_INFO(Render::RenderGeometryRenderer, Q_REQUIRES_CLEANUP);
+
+} // Qt3D
+
+QT_END_NAMESPACE
+
+
+#endif // QT3D_RENDER_GEOMETRYRENDERERMANAGER_H
diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h
index b0a8cc8b4..d212296f2 100644
--- a/src/render/backend/managers_p.h
+++ b/src/render/backend/managers_p.h
@@ -60,7 +60,6 @@
 #include <Qt3DRenderer/private/rendertextureimage_p.h>
 #include <Qt3DRenderer/private/renderattribute_p.h>
 #include <Qt3DRenderer/private/rendergeometry_p.h>
-#include <Qt3DRenderer/private/rendergeometryrenderer_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -314,15 +313,6 @@ class GeometryManager : public QResourceManager<
 {
 };
 
-class GeometryRendererManager : public QResourceManager<
-        RenderGeometryRenderer,
-        QNodeId,
-        16,
-        Qt3D::ArrayAllocatingPolicy,
-        Qt3D::ObjectLevelLockingPolicy>
-{
-};
-
 } // Render
 
 Q_DECLARE_RESOURCE_INFO(Render::RenderAnnotation, Q_REQUIRES_CLEANUP);
@@ -340,7 +330,6 @@ Q_DECLARE_RESOURCE_INFO(Render::RenderRenderPass, Q_REQUIRES_CLEANUP);
 Q_DECLARE_RESOURCE_INFO(Render::RenderTextureImage, 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
 
diff --git a/src/render/backend/qrenderaspect.cpp b/src/render/backend/qrenderaspect.cpp
index 955a88f6a..cd78998c3 100644
--- a/src/render/backend/qrenderaspect.cpp
+++ b/src/render/backend/qrenderaspect.cpp
@@ -42,6 +42,7 @@
 #include <Qt3DRenderer/private/texturedatamanager_p.h>
 #include <Qt3DRenderer/private/renderer_p.h>
 #include <Qt3DRenderer/private/scenemanager_p.h>
+#include <Qt3DRenderer/private/geometryrenderermanager_p.h>
 
 #include <Qt3DRenderer/qabstractsceneloader.h>
 #include <Qt3DRenderer/qcameraselector.h>
diff --git a/src/render/backend/render-backend.pri b/src/render/backend/render-backend.pri
index bb44cacae..8c0d82614 100644
--- a/src/render/backend/render-backend.pri
+++ b/src/render/backend/render-backend.pri
@@ -56,7 +56,8 @@ HEADERS += \
     $$PWD/renderattribute_p.h \
     $$PWD/rendergeometry_p.h \
     $$PWD/rendergeometryrenderer_p.h \
-    $$PWD/buffermanager_p.h
+    $$PWD/buffermanager_p.h \
+    $$PWD/geometryrenderermanager_p.h
 
 SOURCES += \
     $$PWD/qrenderaspect.cpp \
@@ -103,4 +104,5 @@ SOURCES += \
     $$PWD/renderattribute.cpp \
     $$PWD/rendergeometry.cpp \
     $$PWD/rendergeometryrenderer.cpp \
-    $$PWD/buffermanager.cpp
+    $$PWD/buffermanager.cpp \
+    $$PWD/geometryrenderermanager.cpp
diff --git a/src/render/backend/renderentity.cpp b/src/render/backend/renderentity.cpp
index 51b7902ae..1de9fbc34 100644
--- a/src/render/backend/renderentity.cpp
+++ b/src/render/backend/renderentity.cpp
@@ -46,6 +46,7 @@
 #include <Qt3DRenderer/sphere.h>
 #include <Qt3DRenderer/qshaderdata.h>
 #include <Qt3DRenderer/qgeometryrenderer.h>
+#include <Qt3DRenderer/private/geometryrenderermanager_p.h>
 
 #include <Qt3DCore/qcameralens.h>
 #include <Qt3DCore/qentity.h>
diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp
index 79184b801..7df5cbfc4 100644
--- a/src/render/backend/renderer.cpp
+++ b/src/render/backend/renderer.cpp
@@ -76,6 +76,7 @@
 #include <Qt3DRenderer/private/vsyncframeadvanceservice_p.h>
 #include <Qt3DRenderer/private/buffermanager_p.h>
 #include <Qt3DRenderer/private/loadbufferjob_p.h>
+#include <Qt3DRenderer/private/geometryrenderermanager_p.h>
 
 #include <Qt3DCore/qcameralens.h>
 #include <Qt3DCore/private/qaspectmanager_p.h>