Move Renderer specific classes into new folder

This is another step toward isolating the renderer from the render aspect

Change-Id: I4031675b961d6645b65bbe05cf62d150993038b0
Task-number: QTBUG-61151
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

79 files changed, 128 insertions, 188 deletions

diff --git a/src/render/backend/render-backend.pri b/src/render/backend/render-backend.pri
index cde9e77b9..352de3be5 100644
--- a/src/render/backend/render-backend.pri
+++ b/src/render/backend/render-backend.pri
@@ -2,15 +2,9 @@ INCLUDEPATH += $$PWD
 
 HEADERS += \
     $$PWD/renderthread_p.h \
-    $$PWD/renderconfiguration_p.h \
-    $$PWD/renderer_p.h \
-    $$PWD/renderview_p.h \
-    $$PWD/rendercommand_p.h \
-    $$PWD/renderqueue_p.h \
     $$PWD/parameterpack_p.h \
     $$PWD/rendertarget_p.h \
     $$PWD/attachmentpack_p.h \
-    $$PWD/shadervariables_p.h \
     $$PWD/qgraphicsutils_p.h \
     $$PWD/managers_p.h \
     $$PWD/handle_types_p.h \
@@ -24,7 +18,6 @@ HEADERS += \
     $$PWD/boundingvolumedebug_p.h \
     $$PWD/nodemanagers_p.h \
     $$PWD/triangleboundingvolume_p.h \
-    $$PWD/openglvertexarrayobject_p.h \
     $$PWD/trianglesextractor_p.h \
     $$PWD/buffervisitor_p.h \
     $$PWD/bufferutils_p.h \
@@ -36,25 +29,15 @@ HEADERS += \
     $$PWD/backendnode_p.h \
     $$PWD/rendertargetoutput_p.h \
     $$PWD/uniform_p.h \
-    $$PWD/shaderparameterpack_p.h \
-    $$PWD/renderviewbuilder_p.h \
     $$PWD/frameprofiler_p.h \
     $$PWD/offscreensurfacehelper_p.h \
     $$PWD/resourceaccessor_p.h \
-    $$PWD/commandthread_p.h \
     $$PWD/visitorutils_p.h \
     $$PWD/segmentsvisitor_p.h \
-    $$PWD/pointsvisitor_p.h \
-    $$PWD/renderercache_p.h \
-    $$PWD/glcommands_p.h
+    $$PWD/pointsvisitor_p.h
 
 SOURCES += \
     $$PWD/renderthread.cpp \
-    $$PWD/renderconfiguration.cpp \
-    $$PWD/renderer.cpp \
-    $$PWD/renderview.cpp \
-    $$PWD/rendercommand.cpp \
-    $$PWD/renderqueue.cpp \
     $$PWD/parameterpack.cpp \
     $$PWD/rendertarget.cpp \
     $$PWD/managers.cpp \
@@ -75,16 +58,11 @@ SOURCES += \
     $$PWD/backendnode.cpp \
     $$PWD/rendertargetoutput.cpp \
     $$PWD/attachmentpack.cpp \
-    $$PWD/openglvertexarrayobject.cpp \
     $$PWD/uniform.cpp \
-    $$PWD/shaderparameterpack.cpp \
-    $$PWD/renderviewbuilder.cpp \
     $$PWD/offscreensurfacehelper.cpp \
     $$PWD/resourceaccessor.cpp \
     $$PWD/segmentsvisitor.cpp \
-    $$PWD/commandthread.cpp \
-    $$PWD/pointsvisitor.cpp \
-    $$PWD/glcommands.cpp
+    $$PWD/pointsvisitor.cpp
 
 include($$QT3D_BUILD_ROOT/src/core/qt3dcore-config.pri)
 QT_FOR_CONFIG += 3dcore-private
diff --git a/src/render/backend/renderconfiguration.cpp b/src/render/backend/renderconfiguration.cpp
deleted file mode 100644
index 730676996..000000000
--- a/src/render/backend/renderconfiguration.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://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.LGPL3 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-3.0.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 (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "renderconfiguration_p.h"
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DRender {
-namespace Render {
-
-RenderConfiguration::RenderConfiguration()
-{
-}
-
-} // namespace Render
-} // namespace Qt3DRender
-
-QT_END_NAMESPACE
diff --git a/src/render/backend/renderconfiguration_p.h b/src/render/backend/renderconfiguration_p.h
deleted file mode 100644
index 9aa950faa..000000000
--- a/src/render/backend/renderconfiguration_p.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://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.LGPL3 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-3.0.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 (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT3DRENDER_RENDER_RENDERCONFIGURATION_H
-#define QT3DRENDER_RENDER_RENDERCONFIGURATION_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of other Qt classes.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DRender {
-namespace Render {
-
-class RenderConfiguration
-{
-public:
-    RenderConfiguration();
-};
-
-} // namespace Render
-} // namespace Qt3DRender
-
-QT_END_NAMESPACE
-
-#endif // QT3DRENDER_RENDER_RENDERCONFIGURATION_H
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp
index 100707b20..c3a4f4b92 100644
--- a/src/render/frontend/qrenderaspect.cpp
+++ b/src/render/frontend/qrenderaspect.cpp
@@ -547,6 +547,8 @@ void QRenderAspect::onRegistered()
     // and started.
     Q_D(QRenderAspect);
     d->m_nodeManagers = new Render::NodeManagers();
+
+    // TO DO: Load proper Renderer class based on Qt configuration preferences
     d->m_renderer = new Render::Renderer(d->m_renderType);
     d->m_renderer->setNodeManagers(d->m_nodeManagers);
 
diff --git a/src/render/io/io.pri b/src/render/io/io.pri
index aca983d4b..6a48ebbc4 100644
--- a/src/render/io/io.pri
+++ b/src/render/io/io.pri
@@ -9,7 +9,6 @@ HEADERS += \
     $$PWD/scenemanager_p.h \
     $$PWD/qsceneimporter_p.h \
     $$PWD/qsceneimportplugin_p.h \
-    $$PWD/glbuffer_p.h \
     $$PWD/qsceneimportfactory_p.h \
     $$PWD/qsceneexportfactory_p.h \
     $$PWD/qsceneexporter_p.h \
@@ -25,7 +24,6 @@ SOURCES += \
     $$PWD/scenemanager.cpp \
     $$PWD/qsceneimporter.cpp \
     $$PWD/qsceneimportplugin.cpp \
-    $$PWD/glbuffer.cpp \
     $$PWD/qsceneimportfactory.cpp \
     $$PWD/qsceneexportfactory.cpp \
     $$PWD/qsceneexporter.cpp \
diff --git a/src/render/jobs/jobs.pri b/src/render/jobs/jobs.pri
index 74c8c598a..abb3f605c 100644
--- a/src/render/jobs/jobs.pri
+++ b/src/render/jobs/jobs.pri
@@ -2,7 +2,6 @@ INCLUDEPATH += $$PWD
 
 HEADERS += \
     $$PWD/updateworldtransformjob_p.h \
-    $$PWD/renderviewjobutils_p.h \
     $$PWD/loadscenejob_p.h \
     $$PWD/framecleanupjob_p.h \
     $$PWD/loadtexturedatajob_p.h \
@@ -15,10 +14,7 @@ HEADERS += \
     $$PWD/job_common_p.h \
     $$PWD/filterlayerentityjob_p.h \
     $$PWD/filterentitybycomponentjob_p.h \
-    $$PWD/materialparametergathererjob_p.h \
     $$PWD/genericlambdajob_p.h \
-    $$PWD/renderviewbuilderjob_p.h \
-    $$PWD/renderviewinitializerjob_p.h \
     $$PWD/frustumcullingjob_p.h \
     $$PWD/lightgatherer_p.h \
     $$PWD/expandboundingvolumejob_p.h \
@@ -28,7 +24,6 @@ HEADERS += \
     $$PWD/updatelevelofdetailjob_p.h \
     $$PWD/updatemeshtrianglelistjob_p.h \
     $$PWD/pickboundingvolumeutils_p.h \
-    $$PWD/filtercompatibletechniquejob_p.h \
     $$PWD/updatetreeenabledjob_p.h \
     $$PWD/sendbuffercapturejob_p.h \
     $$PWD/loadskeletonjob_p.h \
@@ -39,7 +34,6 @@ HEADERS += \
 
 SOURCES += \
     $$PWD/updateworldtransformjob.cpp \
-    $$PWD/renderviewjobutils.cpp \
     $$PWD/loadscenejob.cpp \
     $$PWD/framecleanupjob.cpp \
     $$PWD/loadtexturedatajob.cpp \
@@ -50,9 +44,6 @@ SOURCES += \
     $$PWD/calcgeometrytrianglevolumes.cpp \
     $$PWD/computefilteredboundingvolumejob.cpp \
     $$PWD/filterlayerentityjob.cpp \
-    $$PWD/materialparametergathererjob.cpp \
-    $$PWD/renderviewbuilderjob.cpp \
-    $$PWD/renderviewinitializerjob.cpp \
     $$PWD/frustumcullingjob.cpp \
     $$PWD/lightgatherer.cpp \
     $$PWD/expandboundingvolumejob.cpp \
@@ -62,7 +53,6 @@ SOURCES += \
     $$PWD/updatemeshtrianglelistjob.cpp \
     $$PWD/updatelevelofdetailjob.cpp \
     $$PWD/pickboundingvolumeutils.cpp \
-    $$PWD/filtercompatibletechniquejob.cpp \
     $$PWD/updatetreeenabledjob.cpp \
     $$PWD/sendbuffercapturejob.cpp \
     $$PWD/loadskeletonjob.cpp \
diff --git a/src/render/materialsystem/material.cpp b/src/render/materialsystem/material.cpp
index f2abfb9ad..723dbfd31 100644
--- a/src/render/materialsystem/material.cpp
+++ b/src/render/materialsystem/material.cpp
@@ -38,7 +38,6 @@
 ****************************************************************************/
 
 #include "material_p.h"
-#include "graphicscontext_p.h"
 #include "technique_p.h"
 #include "effect_p.h"
 #include "qparameter.h"
diff --git a/src/render/render.pro b/src/render/render.pro
index 3929cb121..fae103b2c 100644
--- a/src/render/render.pro
+++ b/src/render/render.pro
@@ -7,7 +7,6 @@ QT_FOR_PRIVATE = concurrent
 
 include (backend/render-backend.pri)
 include (geometry/geometry.pri)
-include (graphicshelpers/graphicshelpers.pri)
 include (framegraph/framegraph.pri)
 include (frontend/render-frontend.pri)
 include (jobs/jobs.pri)
@@ -19,6 +18,7 @@ include (picking/picking.pri)
 include (raycasting/raycasting.pri)
 include (services/services.pri)
 include (texture/texture.pri)
+include (renderers/renderers.pri)
 
 # Qt3D is free of Q_FOREACH - make sure it stays that way:
 DEFINES += QT_NO_FOREACH
diff --git a/src/render/graphicshelpers/graphicscontext.cpp b/src/render/renderers/opengl/graphicshelpers/graphicscontext.cpp
index c2ec3db59..c2ec3db59 100644
--- a/src/render/graphicshelpers/graphicscontext.cpp
+++ b/src/render/renderers/opengl/graphicshelpers/graphicscontext.cpp
diff --git a/src/render/graphicshelpers/graphicscontext_p.h b/src/render/renderers/opengl/graphicshelpers/graphicscontext_p.h
index 82db57433..82db57433 100644
--- a/src/render/graphicshelpers/graphicscontext_p.h
+++ b/src/render/renderers/opengl/graphicshelpers/graphicscontext_p.h
diff --git a/src/render/graphicshelpers/graphicshelperes2.cpp b/src/render/renderers/opengl/graphicshelpers/graphicshelperes2.cpp
index 966528ad8..966528ad8 100644
--- a/src/render/graphicshelpers/graphicshelperes2.cpp
+++ b/src/render/renderers/opengl/graphicshelpers/graphicshelperes2.cpp
diff --git a/src/render/graphicshelpers/graphicshelperes2_p.h b/src/render/renderers/opengl/graphicshelpers/graphicshelperes2_p.h
index 1c6df41b6..1c6df41b6 100644
--- a/src/render/graphicshelpers/graphicshelperes2_p.h
+++ b/src/render/renderers/opengl/graphicshelpers/graphicshelperes2_p.h
diff --git a/src/render/graphicshelpers/graphicshelperes3.cpp b/src/render/renderers/opengl/graphicshelpers/graphicshelperes3.cpp
index 813c627b8..813c627b8 100644
--- a/src/render/graphicshelpers/graphicshelperes3.cpp
+++ b/src/render/renderers/opengl/graphicshelpers/graphicshelperes3.cpp
diff --git a/src/render/graphicshelpers/graphicshelperes3_2.cpp b/src/render/renderers/opengl/graphicshelpers/graphicshelperes3_2.cpp
index 6290d091d..6290d091d 100644
--- a/src/render/graphicshelpers/graphicshelperes3_2.cpp
+++ b/src/render/renderers/opengl/graphicshelpers/graphicshelperes3_2.cpp
diff --git a/src/render/graphicshelpers/graphicshelperes3_2_p.h b/src/render/renderers/opengl/graphicshelpers/graphicshelperes3_2_p.h
index 018db6481..018db6481 100644
--- a/src/render/graphicshelpers/graphicshelperes3_2_p.h
+++ b/src/render/renderers/opengl/graphicshelpers/graphicshelperes3_2_p.h
diff --git a/src/render/graphicshelpers/graphicshelperes3_p.h b/src/render/renderers/opengl/graphicshelpers/graphicshelperes3_p.h
index 9bca2d48d..9bca2d48d 100644
--- a/src/render/graphicshelpers/graphicshelperes3_p.h
+++ b/src/render/renderers/opengl/graphicshelpers/graphicshelperes3_p.h
diff --git a/src/render/graphicshelpers/graphicshelpergl2.cpp b/src/render/renderers/opengl/graphicshelpers/graphicshelpergl2.cpp
index 6da8a9b6f..6da8a9b6f 100644
--- a/src/render/graphicshelpers/graphicshelpergl2.cpp
+++ b/src/render/renderers/opengl/graphicshelpers/graphicshelpergl2.cpp
diff --git a/src/render/graphicshelpers/graphicshelpergl2_p.h b/src/render/renderers/opengl/graphicshelpers/graphicshelpergl2_p.h
index 2db75004f..2db75004f 100644
--- a/src/render/graphicshelpers/graphicshelpergl2_p.h
+++ b/src/render/renderers/opengl/graphicshelpers/graphicshelpergl2_p.h
diff --git a/src/render/graphicshelpers/graphicshelpergl3_2.cpp b/src/render/renderers/opengl/graphicshelpers/graphicshelpergl3_2.cpp
index a35c4e37f..a35c4e37f 100644
--- a/src/render/graphicshelpers/graphicshelpergl3_2.cpp
+++ b/src/render/renderers/opengl/graphicshelpers/graphicshelpergl3_2.cpp
diff --git a/src/render/graphicshelpers/graphicshelpergl3_2_p.h b/src/render/renderers/opengl/graphicshelpers/graphicshelpergl3_2_p.h
index 133295fd7..133295fd7 100644
--- a/src/render/graphicshelpers/graphicshelpergl3_2_p.h
+++ b/src/render/renderers/opengl/graphicshelpers/graphicshelpergl3_2_p.h
diff --git a/src/render/graphicshelpers/graphicshelpergl3_3.cpp b/src/render/renderers/opengl/graphicshelpers/graphicshelpergl3_3.cpp
index b2512d84a..b2512d84a 100644
--- a/src/render/graphicshelpers/graphicshelpergl3_3.cpp
+++ b/src/render/renderers/opengl/graphicshelpers/graphicshelpergl3_3.cpp
diff --git a/src/render/graphicshelpers/graphicshelpergl3_3_p.h b/src/render/renderers/opengl/graphicshelpers/graphicshelpergl3_3_p.h
index 0ecdd3620..0ecdd3620 100644
--- a/src/render/graphicshelpers/graphicshelpergl3_3_p.h
+++ b/src/render/renderers/opengl/graphicshelpers/graphicshelpergl3_3_p.h
diff --git a/src/render/graphicshelpers/graphicshelpergl4.cpp b/src/render/renderers/opengl/graphicshelpers/graphicshelpergl4.cpp
index ce1b8ac2b..ce1b8ac2b 100644
--- a/src/render/graphicshelpers/graphicshelpergl4.cpp
+++ b/src/render/renderers/opengl/graphicshelpers/graphicshelpergl4.cpp
diff --git a/src/render/graphicshelpers/graphicshelpergl4_p.h b/src/render/renderers/opengl/graphicshelpers/graphicshelpergl4_p.h
index 3020b16d8..3020b16d8 100644
--- a/src/render/graphicshelpers/graphicshelpergl4_p.h
+++ b/src/render/renderers/opengl/graphicshelpers/graphicshelpergl4_p.h
diff --git a/src/render/graphicshelpers/graphicshelperinterface_p.h b/src/render/renderers/opengl/graphicshelpers/graphicshelperinterface_p.h
index e41325cb7..e41325cb7 100644
--- a/src/render/graphicshelpers/graphicshelperinterface_p.h
+++ b/src/render/renderers/opengl/graphicshelpers/graphicshelperinterface_p.h
diff --git a/src/render/graphicshelpers/graphicshelpers.pri b/src/render/renderers/opengl/graphicshelpers/graphicshelpers.pri
index b3698858a..b3698858a 100644
--- a/src/render/graphicshelpers/graphicshelpers.pri
+++ b/src/render/renderers/opengl/graphicshelpers/graphicshelpers.pri
diff --git a/src/render/graphicshelpers/submissioncontext.cpp b/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp
index df7d61902..df7d61902 100644
--- a/src/render/graphicshelpers/submissioncontext.cpp
+++ b/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp
diff --git a/src/render/graphicshelpers/submissioncontext_p.h b/src/render/renderers/opengl/graphicshelpers/submissioncontext_p.h
index 8efdcbc63..8efdcbc63 100644
--- a/src/render/graphicshelpers/submissioncontext_p.h
+++ b/src/render/renderers/opengl/graphicshelpers/submissioncontext_p.h
diff --git a/src/render/io/glbuffer.cpp b/src/render/renderers/opengl/io/glbuffer.cpp
index f1b860f03..f1b860f03 100644
--- a/src/render/io/glbuffer.cpp
+++ b/src/render/renderers/opengl/io/glbuffer.cpp
diff --git a/src/render/io/glbuffer_p.h b/src/render/renderers/opengl/io/glbuffer_p.h
index 731634b6b..731634b6b 100644
--- a/src/render/io/glbuffer_p.h
+++ b/src/render/renderers/opengl/io/glbuffer_p.h
diff --git a/src/render/renderers/opengl/io/io.pri b/src/render/renderers/opengl/io/io.pri
new file mode 100644
index 000000000..462978c4d
--- /dev/null
+++ b/src/render/renderers/opengl/io/io.pri
@@ -0,0 +1,8 @@
+INCLUDEPATH += $$PWD
+
+SOURCES += \
+    $$PWD/glbuffer.cpp
+
+HEADERS += \
+    $$PWD/glbuffer_p.h
+
diff --git a/src/render/jobs/filtercompatibletechniquejob.cpp b/src/render/renderers/opengl/jobs/filtercompatibletechniquejob.cpp
index 342fd3dad..342fd3dad 100644
--- a/src/render/jobs/filtercompatibletechniquejob.cpp
+++ b/src/render/renderers/opengl/jobs/filtercompatibletechniquejob.cpp
diff --git a/src/render/jobs/filtercompatibletechniquejob_p.h b/src/render/renderers/opengl/jobs/filtercompatibletechniquejob_p.h
index 4f7a7146c..4f7a7146c 100644
--- a/src/render/jobs/filtercompatibletechniquejob_p.h
+++ b/src/render/renderers/opengl/jobs/filtercompatibletechniquejob_p.h
diff --git a/src/render/renderers/opengl/jobs/jobs.pri b/src/render/renderers/opengl/jobs/jobs.pri
new file mode 100644
index 000000000..021cd3242
--- /dev/null
+++ b/src/render/renderers/opengl/jobs/jobs.pri
@@ -0,0 +1,15 @@
+INCLUDEPATH += $$PWD
+
+SOURCES += \
+    $$PWD/filtercompatibletechniquejob.cpp \
+    $$PWD/materialparametergathererjob.cpp \
+    $$PWD/renderviewbuilderjob.cpp \
+    $$PWD/renderviewinitializerjob.cpp \
+    $$PWD/renderviewjobutils.cpp
+
+HEADERS += \
+    $$PWD/filtercompatibletechniquejob_p.h \
+    $$PWD/materialparametergathererjob_p.h \
+    $$PWD/renderviewbuilderjob_p.h \
+    $$PWD/renderviewinitializerjob_p.h \
+    $$PWD/renderviewjobutils_p.h
diff --git a/src/render/jobs/materialparametergathererjob.cpp b/src/render/renderers/opengl/jobs/materialparametergathererjob.cpp
index bae516c7e..bae516c7e 100644
--- a/src/render/jobs/materialparametergathererjob.cpp
+++ b/src/render/renderers/opengl/jobs/materialparametergathererjob.cpp
diff --git a/src/render/jobs/materialparametergathererjob_p.h b/src/render/renderers/opengl/jobs/materialparametergathererjob_p.h
index 687163387..687163387 100644
--- a/src/render/jobs/materialparametergathererjob_p.h
+++ b/src/render/renderers/opengl/jobs/materialparametergathererjob_p.h
diff --git a/src/render/jobs/renderviewbuilderjob.cpp b/src/render/renderers/opengl/jobs/renderviewbuilderjob.cpp
index fa6218d6f..fa6218d6f 100644
--- a/src/render/jobs/renderviewbuilderjob.cpp
+++ b/src/render/renderers/opengl/jobs/renderviewbuilderjob.cpp
diff --git a/src/render/jobs/renderviewbuilderjob_p.h b/src/render/renderers/opengl/jobs/renderviewbuilderjob_p.h
index c38f788b0..c38f788b0 100644
--- a/src/render/jobs/renderviewbuilderjob_p.h
+++ b/src/render/renderers/opengl/jobs/renderviewbuilderjob_p.h
diff --git a/src/render/jobs/renderviewinitializerjob.cpp b/src/render/renderers/opengl/jobs/renderviewinitializerjob.cpp
index 7bf55be40..7bf55be40 100644
--- a/src/render/jobs/renderviewinitializerjob.cpp
+++ b/src/render/renderers/opengl/jobs/renderviewinitializerjob.cpp
diff --git a/src/render/jobs/renderviewinitializerjob_p.h b/src/render/renderers/opengl/jobs/renderviewinitializerjob_p.h
index fb4e2c67c..fb4e2c67c 100644
--- a/src/render/jobs/renderviewinitializerjob_p.h
+++ b/src/render/renderers/opengl/jobs/renderviewinitializerjob_p.h
diff --git a/src/render/jobs/renderviewjobutils.cpp b/src/render/renderers/opengl/jobs/renderviewjobutils.cpp
index ffad387c6..ffad387c6 100644
--- a/src/render/jobs/renderviewjobutils.cpp
+++ b/src/render/renderers/opengl/jobs/renderviewjobutils.cpp
diff --git a/src/render/jobs/renderviewjobutils_p.h b/src/render/renderers/opengl/jobs/renderviewjobutils_p.h
index 468a95bfd..468a95bfd 100644
--- a/src/render/jobs/renderviewjobutils_p.h
+++ b/src/render/renderers/opengl/jobs/renderviewjobutils_p.h
diff --git a/src/render/renderers/opengl/opengl.pri b/src/render/renderers/opengl/opengl.pri
new file mode 100644
index 000000000..a669bf4ba
--- /dev/null
+++ b/src/render/renderers/opengl/opengl.pri
@@ -0,0 +1,18 @@
+
+include (renderer/renderer.pri)
+include (jobs/jobs.pri)
+include (io/io.pri)
+include (textures/textures.pri)
+include (graphicshelpers/graphicshelpers.pri)
+include (renderstates/renderstates.pri)
+
+# Qt3D is free of Q_FOREACH - make sure it stays that way:
+DEFINES += QT_NO_FOREACH
+
+gcov {
+    QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
+    QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage
+}
+
+# otherwise mingw headers do not declare common functions like ::strcasecmp
+win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x
diff --git a/src/render/backend/commandthread.cpp b/src/render/renderers/opengl/renderer/commandthread.cpp
index 387fc1113..387fc1113 100644
--- a/src/render/backend/commandthread.cpp
+++ b/src/render/renderers/opengl/renderer/commandthread.cpp
diff --git a/src/render/backend/commandthread_p.h b/src/render/renderers/opengl/renderer/commandthread_p.h
index 0508675c4..0508675c4 100644
--- a/src/render/backend/commandthread_p.h
+++ b/src/render/renderers/opengl/renderer/commandthread_p.h
diff --git a/src/render/backend/glcommands.cpp b/src/render/renderers/opengl/renderer/glcommands.cpp
index fd7ee9fe8..fd7ee9fe8 100644
--- a/src/render/backend/glcommands.cpp
+++ b/src/render/renderers/opengl/renderer/glcommands.cpp
diff --git a/src/render/backend/glcommands_p.h b/src/render/renderers/opengl/renderer/glcommands_p.h
index 5ed360759..5ed360759 100644
--- a/src/render/backend/glcommands_p.h
+++ b/src/render/renderers/opengl/renderer/glcommands_p.h
diff --git a/src/render/backend/openglvertexarrayobject.cpp b/src/render/renderers/opengl/renderer/openglvertexarrayobject.cpp
index 0c4fd8c9d..0c4fd8c9d 100644
--- a/src/render/backend/openglvertexarrayobject.cpp
+++ b/src/render/renderers/opengl/renderer/openglvertexarrayobject.cpp
diff --git a/src/render/backend/openglvertexarrayobject_p.h b/src/render/renderers/opengl/renderer/openglvertexarrayobject_p.h
index eee837221..eee837221 100644
--- a/src/render/backend/openglvertexarrayobject_p.h
+++ b/src/render/renderers/opengl/renderer/openglvertexarrayobject_p.h
diff --git a/src/render/backend/rendercommand.cpp b/src/render/renderers/opengl/renderer/rendercommand.cpp
index e60b17668..e60b17668 100644
--- a/src/render/backend/rendercommand.cpp
+++ b/src/render/renderers/opengl/renderer/rendercommand.cpp
diff --git a/src/render/backend/rendercommand_p.h b/src/render/renderers/opengl/renderer/rendercommand_p.h
index 67e02d35b..67e02d35b 100644
--- a/src/render/backend/rendercommand_p.h
+++ b/src/render/renderers/opengl/renderer/rendercommand_p.h
diff --git a/src/render/backend/renderer.cpp b/src/render/renderers/opengl/renderer/renderer.cpp
index 2611fb6cc..2611fb6cc 100644
--- a/src/render/backend/renderer.cpp
+++ b/src/render/renderers/opengl/renderer/renderer.cpp
diff --git a/src/render/renderers/opengl/renderer/renderer.pri b/src/render/renderers/opengl/renderer/renderer.pri
new file mode 100644
index 000000000..34f6064bd
--- /dev/null
+++ b/src/render/renderers/opengl/renderer/renderer.pri
@@ -0,0 +1,27 @@
+INCLUDEPATH += $$PWD
+
+SOURCES += \
+    $$PWD/commandthread.cpp \
+    $$PWD/glcommands.cpp \
+    $$PWD/openglvertexarrayobject.cpp \
+    $$PWD/rendercommand.cpp \
+    $$PWD/renderer.cpp \
+    $$PWD/renderqueue.cpp \
+    $$PWD/renderview.cpp \
+    $$PWD/renderviewbuilder.cpp \
+    $$PWD/shaderparameterpack.cpp
+
+HEADERS += \
+    $$PWD/commandthread_p.h \
+    $$PWD/glcommands_p.h \
+    $$PWD/openglvertexarrayobject_p.h \
+    $$PWD/renderercache_p.h \
+    $$PWD/rendercommand_p.h \
+    $$PWD/renderer_p.h \
+    $$PWD/renderqueue_p.h \
+    $$PWD/renderview_p.h \
+    $$PWD/renderviewbuilder_p.h \
+    $$PWD/shaderparameterpack_p.h \
+    $$PWD/shadervariables_p.h
+
+
diff --git a/src/render/backend/renderer_p.h b/src/render/renderers/opengl/renderer/renderer_p.h
index b4ad0b0fe..b4ad0b0fe 100644
--- a/src/render/backend/renderer_p.h
+++ b/src/render/renderers/opengl/renderer/renderer_p.h
diff --git a/src/render/backend/renderercache_p.h b/src/render/renderers/opengl/renderer/renderercache_p.h
index 2aa50d131..2aa50d131 100644
--- a/src/render/backend/renderercache_p.h
+++ b/src/render/renderers/opengl/renderer/renderercache_p.h
diff --git a/src/render/backend/renderqueue.cpp b/src/render/renderers/opengl/renderer/renderqueue.cpp
index bd9d3ee59..bd9d3ee59 100644
--- a/src/render/backend/renderqueue.cpp
+++ b/src/render/renderers/opengl/renderer/renderqueue.cpp
diff --git a/src/render/backend/renderqueue_p.h b/src/render/renderers/opengl/renderer/renderqueue_p.h
index e565115f2..e565115f2 100644
--- a/src/render/backend/renderqueue_p.h
+++ b/src/render/renderers/opengl/renderer/renderqueue_p.h
diff --git a/src/render/backend/renderview.cpp b/src/render/renderers/opengl/renderer/renderview.cpp
index c29448570..c29448570 100644
--- a/src/render/backend/renderview.cpp
+++ b/src/render/renderers/opengl/renderer/renderview.cpp
diff --git a/src/render/backend/renderview_p.h b/src/render/renderers/opengl/renderer/renderview_p.h
index cb3c74917..cb3c74917 100644
--- a/src/render/backend/renderview_p.h
+++ b/src/render/renderers/opengl/renderer/renderview_p.h
diff --git a/src/render/backend/renderviewbuilder.cpp b/src/render/renderers/opengl/renderer/renderviewbuilder.cpp
index d08bd6dd4..d08bd6dd4 100644
--- a/src/render/backend/renderviewbuilder.cpp
+++ b/src/render/renderers/opengl/renderer/renderviewbuilder.cpp
diff --git a/src/render/backend/renderviewbuilder_p.h b/src/render/renderers/opengl/renderer/renderviewbuilder_p.h
index 818313500..818313500 100644
--- a/src/render/backend/renderviewbuilder_p.h
+++ b/src/render/renderers/opengl/renderer/renderviewbuilder_p.h
diff --git a/src/render/backend/shaderparameterpack.cpp b/src/render/renderers/opengl/renderer/shaderparameterpack.cpp
index f78e45a5e..f78e45a5e 100644
--- a/src/render/backend/shaderparameterpack.cpp
+++ b/src/render/renderers/opengl/renderer/shaderparameterpack.cpp
diff --git a/src/render/backend/shaderparameterpack_p.h b/src/render/renderers/opengl/renderer/shaderparameterpack_p.h
index 5703bb17b..5703bb17b 100644
--- a/src/render/backend/shaderparameterpack_p.h
+++ b/src/render/renderers/opengl/renderer/shaderparameterpack_p.h
diff --git a/src/render/backend/shadervariables_p.h b/src/render/renderers/opengl/renderer/shadervariables_p.h
index e0fa07dff..e0fa07dff 100644
--- a/src/render/backend/shadervariables_p.h
+++ b/src/render/renderers/opengl/renderer/shadervariables_p.h
diff --git a/src/render/renderers/opengl/renderstates/renderstates.pri b/src/render/renderers/opengl/renderstates/renderstates.pri
new file mode 100644
index 000000000..10f51a0ed
--- /dev/null
+++ b/src/render/renderers/opengl/renderstates/renderstates.pri
@@ -0,0 +1,7 @@
+INCLUDEPATH += $$PWD
+
+SOURCES += \
+    $$PWD/renderstateset.cpp
+
+HEADERS += \
+    $$PWD/renderstateset_p.h
diff --git a/src/render/renderstates/renderstateset.cpp b/src/render/renderers/opengl/renderstates/renderstateset.cpp
index bf84b0e1c..bf84b0e1c 100644
--- a/src/render/renderstates/renderstateset.cpp
+++ b/src/render/renderers/opengl/renderstates/renderstateset.cpp
diff --git a/src/render/renderstates/renderstateset_p.h b/src/render/renderers/opengl/renderstates/renderstateset_p.h
index 58d46c7a6..58d46c7a6 100644
--- a/src/render/renderstates/renderstateset_p.h
+++ b/src/render/renderers/opengl/renderstates/renderstateset_p.h
diff --git a/src/render/texture/gltexture.cpp b/src/render/renderers/opengl/textures/gltexture.cpp
index e94122f67..e94122f67 100644
--- a/src/render/texture/gltexture.cpp
+++ b/src/render/renderers/opengl/textures/gltexture.cpp
diff --git a/src/render/texture/gltexture_p.h b/src/render/renderers/opengl/textures/gltexture_p.h
index cde0a6973..cde0a6973 100644
--- a/src/render/texture/gltexture_p.h
+++ b/src/render/renderers/opengl/textures/gltexture_p.h
diff --git a/src/render/texture/gltexturemanager_p.h b/src/render/renderers/opengl/textures/gltexturemanager_p.h
index 1c8b49911..1c8b49911 100644
--- a/src/render/texture/gltexturemanager_p.h
+++ b/src/render/renderers/opengl/textures/gltexturemanager_p.h
diff --git a/src/render/texture/renderbuffer.cpp b/src/render/renderers/opengl/textures/renderbuffer.cpp
index bc5050f73..bc5050f73 100644
--- a/src/render/texture/renderbuffer.cpp
+++ b/src/render/renderers/opengl/textures/renderbuffer.cpp
diff --git a/src/render/texture/renderbuffer_p.h b/src/render/renderers/opengl/textures/renderbuffer_p.h
index 7dc62492a..7dc62492a 100644
--- a/src/render/texture/renderbuffer_p.h
+++ b/src/render/renderers/opengl/textures/renderbuffer_p.h
diff --git a/src/render/renderers/opengl/textures/textures.pri b/src/render/renderers/opengl/textures/textures.pri
new file mode 100644
index 000000000..42ffff7eb
--- /dev/null
+++ b/src/render/renderers/opengl/textures/textures.pri
@@ -0,0 +1,12 @@
+INCLUDEPATH += $$PWD
+
+SOURCES += \
+    $$PWD/gltexture.cpp \
+    $$PWD/renderbuffer.cpp
+
+HEADERS += \
+    $$PWD/gltexturemanager_p.h \
+    $$PWD/gltexture_p.h \
+    $$PWD/renderbuffer_p.h
+
+
diff --git a/src/render/renderers/renderers.pri b/src/render/renderers/renderers.pri
new file mode 100644
index 000000000..795a6fbdf
--- /dev/null
+++ b/src/render/renderers/renderers.pri
@@ -0,0 +1,7 @@
+TEMPLATE = subdirs
+
+# OpenGL renderer
+include($$OUT_PWD/qt3drender-config.pri)
+QT_FOR_CONFIG += 3drender-private
+
+qtConfig(qt3d-opengl-renderer): include(opengl/opengl.pri)
diff --git a/src/render/renderstates/renderstates.pri b/src/render/renderstates/renderstates.pri
index 7418ce162..c6a041bd9 100644
--- a/src/render/renderstates/renderstates.pri
+++ b/src/render/renderstates/renderstates.pri
@@ -22,7 +22,6 @@ HEADERS += \
     $$PWD/qstenciltestarguments.h \
     $$PWD/qrenderstatecreatedchange_p.h \
     $$PWD/renderstates_p.h \
-    $$PWD/renderstateset_p.h \
     $$PWD/qpointsize.h \
     $$PWD/qseamlesscubemap.h \
     $$PWD/qdepthtest.h \
@@ -50,7 +49,6 @@ HEADERS += \
     $$PWD/statemask_p.h \
     $$PWD/statevariant_p.h
 
-
 SOURCES += \
     $$PWD/qalphacoverage.cpp \
     $$PWD/qalphatest.cpp \
@@ -71,12 +69,11 @@ SOURCES += \
     $$PWD/qstenciltest.cpp \
     $$PWD/qstenciltestarguments.cpp \
     $$PWD/renderstates.cpp \
-    $$PWD/renderstateset.cpp \
     $$PWD/qpointsize.cpp \
     $$PWD/qseamlesscubemap.cpp \
     $$PWD/qnodepthmask.cpp \
     $$PWD/qlinewidth.cpp \
     $$PWD/qrenderstatecreatedchange.cpp \
     $$PWD/renderstatenode.cpp \
-    $$PWD/qmultisampleantialiasing.cpp \
-    $$PWD/statevariant.cpp
+    $$PWD/statevariant.cpp \
+    $$PWD/qmultisampleantialiasing.cpp
diff --git a/src/render/texture/texture.pri b/src/render/texture/texture.pri
index 17855d943..0d520a9ec 100644
--- a/src/render/texture/texture.pri
+++ b/src/render/texture/texture.pri
@@ -21,10 +21,7 @@ HEADERS += \
     $$PWD/qtexture_p.h \
     $$PWD/qpaintedtextureimage.h \
     $$PWD/qpaintedtextureimage_p.h \
-    $$PWD/gltexture_p.h \
-    $$PWD/gltexturemanager_p.h \
-    $$PWD/apitexturemanager_p.h \
-    $$PWD/renderbuffer_p.h
+    $$PWD/apitexturemanager_p.h
 
 SOURCES += \
     $$PWD/qabstracttextureimage.cpp \
@@ -37,6 +34,4 @@ SOURCES += \
     $$PWD/qtextureimagedata.cpp \
     $$PWD/qtexturedata.cpp \
     $$PWD/qtexturegenerator.cpp \
-    $$PWD/qpaintedtextureimage.cpp \
-    $$PWD/gltexture.cpp \
-    $$PWD/renderbuffer.cpp
+    $$PWD/qpaintedtextureimage.cpp
diff --git a/tests/auto/render/commons/testrenderer.cpp b/tests/auto/render/commons/testrenderer.cpp
index 5304ff142..277b2b99b 100644
--- a/tests/auto/render/commons/testrenderer.cpp
+++ b/tests/auto/render/commons/testrenderer.cpp
@@ -51,10 +51,12 @@ Qt3DRender::Render::AbstractRenderer::BackendNodeDirtySet TestRenderer::dirtyBit
     return m_changes;
 }
 
+#if defined(QT_BUILD_INTERNAL)
 void TestRenderer::clearDirtyBits(Qt3DRender::Render::AbstractRenderer::BackendNodeDirtySet changes)
 {
     m_changes &= changes;
 }
+#endif
 
 void TestRenderer::resetDirty()
 {
diff --git a/tests/auto/render/commons/testrenderer.h b/tests/auto/render/commons/testrenderer.h
index 26b7c6fc6..355331516 100644
--- a/tests/auto/render/commons/testrenderer.h
+++ b/tests/auto/render/commons/testrenderer.h
@@ -72,7 +72,9 @@ public:
 
     void markDirty(Qt3DRender::Render::AbstractRenderer::BackendNodeDirtySet changes, Qt3DRender::Render::BackendNode *node) override;
     Qt3DRender::Render::AbstractRenderer::BackendNodeDirtySet dirtyBits() override;
+#if defined(QT_BUILD_INTERNAL)
     void clearDirtyBits(Qt3DRender::Render::AbstractRenderer::BackendNodeDirtySet changes) override;
+#endif
 
     void resetDirty();
     QVariant executeCommand(const QStringList &args) override;
diff --git a/tests/auto/render/render.pro b/tests/auto/render/render.pro
index 7a71ae264..1a510d069 100644
--- a/tests/auto/render/render.pro
+++ b/tests/auto/render/render.pro
@@ -3,14 +3,11 @@ TEMPLATE = subdirs
 qtConfig(private_tests) {
     SUBDIRS += \
         entity \
-        renderqueue \
         renderpass \
         qgraphicsutils \
         shader \
         shaderbuilder \
         texture \
-        renderviewutils \
-        renderviews \
         material \
         vsyncframeadvanceservice \
         meshfunctors \
@@ -59,11 +56,6 @@ qtConfig(private_tests) {
         loadscenejob \
         qrendercapture \
         uniform \
-        graphicshelpergl3_3 \
-        graphicshelpergl3_2 \
-        graphicshelpergl2 \
-        sendrendercapturejob \
-        textures \
         qparameter \
         parameter \
         qtextureloader \
@@ -85,9 +77,6 @@ qtConfig(private_tests) {
         filterkey \
         qmesh \
         technique \
-        materialparametergathererjob \
-        renderviewbuilder \
-        filtercompatibletechniquejob \
         rendercapture \
         segmentvisitor \
         trianglevisitor \
@@ -97,7 +86,6 @@ qtConfig(private_tests) {
         qshaderprogrambuilder \
         coordinatereader \
         framegraphvisitor \
-        renderer \
         armature \
         skeleton \
         joint \
@@ -122,6 +110,27 @@ qtConfig(private_tests) {
         trianglesextractor \
         triangleboundingvolume \
     }
+}
+
+# Tests related to the OpenGL renderer
+QT_FOR_CONFIG += 3drender-private
+
+qtConfig(qt3d-opengl-renderer):qtConfig(private_tests) {
+
+    SUBDIRS += \
+        filtercompatibletechniquejob \
+        graphicshelpergl3_3 \
+        graphicshelpergl3_2 \
+        graphicshelpergl2 \
+        materialparametergathererjob \
+        textures \
+        scene2d \
+        renderer \
+        renderviewutils \
+        renderviews \
+        renderqueue \
+        renderviewbuilder \
+        sendrendercapturejob
 
     qtConfig(qt3d-extras) {
         SUBDIRS += \