Move material system into own directory

Change-Id: Iddc3a5d41dc0aff858d8bc3c5b2f7982bd693d00
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

51 files changed, 53 insertions, 48 deletions

diff --git a/src/render/backend/render-backend.pri b/src/render/backend/render-backend.pri
index f1811b02b..04b3a63c7 100644
--- a/src/render/backend/render-backend.pri
+++ b/src/render/backend/render-backend.pri
@@ -22,24 +22,14 @@ HEADERS += \
     $$PWD/managers_p.h \
     $$PWD/handle_types_p.h \
     $$PWD/platformsurfacefilter_p.h \
-    $$PWD/shaderdata_p.h \
     $$PWD/vsyncframeadvanceservice_p.h \
     $$PWD/qraycastingservice.h \
     $$PWD/qraycastingservice_p.h \
-    $$PWD/annotation_p.h \
     $$PWD/cameralens_p.h \
-    $$PWD/effect_p.h \
     $$PWD/entity_p.h \
     $$PWD/layer_p.h \
-    $$PWD/material_p.h \
     $$PWD/nodefunctor_p.h \
-    $$PWD/parameter_p.h \
-    $$PWD/parametermapping_p.h \
-    $$PWD/renderpass_p.h \
     $$PWD/scene_p.h \
-    $$PWD/shaderdata_p.h \
-    $$PWD/shader_p.h \
-    $$PWD/technique_p.h \
     $$PWD/texture_p.h \
     $$PWD/textureimage_p.h \
     $$PWD/transform_p.h
@@ -61,19 +51,10 @@ SOURCES += \
     $$PWD/platformsurfacefilter.cpp \
     $$PWD/qraycastingservice.cpp \
     $$PWD/vsyncframeadvanceservice.cpp \
-    $$PWD/annotation.cpp \
     $$PWD/cameralens.cpp \
-    $$PWD/effect.cpp \
     $$PWD/entity.cpp \
     $$PWD/layer.cpp \
-    $$PWD/material.cpp \
-    $$PWD/parameter.cpp \
-    $$PWD/parametermapping.cpp \
-    $$PWD/renderpass.cpp \
     $$PWD/scene.cpp \
-    $$PWD/shaderdata.cpp \
-    $$PWD/shader.cpp \
-    $$PWD/technique.cpp \
     $$PWD/texture.cpp \
     $$PWD/textureimage.cpp \
     $$PWD/transform.cpp
diff --git a/src/render/frontend/render-frontend.pri b/src/render/frontend/render-frontend.pri
index 391952602..d4ab488ef 100644
--- a/src/render/frontend/render-frontend.pri
+++ b/src/render/frontend/render-frontend.pri
@@ -5,19 +5,11 @@ include(framegraph-components/framegraph-components.pri)
 HEADERS += \
     $$PWD/qrenderaspect.h \
     $$PWD/qrenderaspect_p.h \
-    $$PWD/qmaterial.h \
-    $$PWD/qrenderpass.h \
-    $$PWD/qshaderprogram.h \
-    $$PWD/qshaderprogram_p.h \
-    $$PWD/qtechnique.h \
     $$PWD/qitemmodelbuffer.h \
     $$PWD/qtexture.h \
     $$PWD/sphere.h \
     $$PWD/qabstractsceneloader.h \
-    $$PWD/qeffect.h \
     $$PWD/qsceneloader.h \
-    $$PWD/qparameter.h \
-    $$PWD/qparameter_p.h \
     $$PWD/qabstractlight.h \
     $$PWD/qpointlight.h \
     $$PWD/qspotlight.h \
@@ -26,24 +18,13 @@ HEADERS += \
     $$PWD/qspotlight_p.h \
     $$PWD/qdirectionallight_p.h \
     $$PWD/qpointlight_p.h \
-    $$PWD/qmaterial_p.h \
-    $$PWD/qeffect_p.h \
-    $$PWD/qtechnique_p.h \
     $$PWD/qabstractsceneloader_p.h \
-    $$PWD/qrenderpass_p.h \
     $$PWD/qlayer.h \
     $$PWD/qlayer_p.h \
-    $$PWD/qopenglfilter.h \
     $$PWD/qrenderattachment.h \
     $$PWD/qrenderattachment_p.h \
     $$PWD/qrendertarget.h \
     $$PWD/qrendertarget_p.h \
-    $$PWD/qannotation.h \
-    $$PWD/qannotation_p.h \
-    $$PWD/qparametermapping_p.h \
-    $$PWD/qparametermapping.h \
-    $$PWD/qshaderdata.h \
-    $$PWD/qshaderdata_p.h \
     $$PWD/qabstracttextureprovider.h \
     $$PWD/qabstracttextureprovider_p.h \
     $$PWD/qwrapmode.h \
@@ -56,27 +37,17 @@ HEADERS += \
 
 SOURCES += \
     $$PWD/qrenderaspect.cpp \
-    $$PWD/qmaterial.cpp \
-    $$PWD/qrenderpass.cpp \
-    $$PWD/qshaderprogram.cpp \
-    $$PWD/qtechnique.cpp \
     $$PWD/qitemmodelbuffer.cpp \
     $$PWD/sphere.cpp \
     $$PWD/qabstractsceneloader.cpp \
-    $$PWD/qeffect.cpp \
     $$PWD/qsceneloader.cpp \
-    $$PWD/qparameter.cpp \
     $$PWD/qabstractlight.cpp \
     $$PWD/qpointlight.cpp \
     $$PWD/qspotlight.cpp \
     $$PWD/qdirectionallight.cpp \
     $$PWD/qlayer.cpp \
-    $$PWD/qopenglfilter.cpp \
     $$PWD/qrenderattachment.cpp \
     $$PWD/qrendertarget.cpp \
-    $$PWD/qannotation.cpp \
-    $$PWD/qparametermapping.cpp \
-    $$PWD/qshaderdata.cpp \
     $$PWD/qabstracttextureprovider.cpp \
     $$PWD/qwrapmode.cpp \
     $$PWD/qabstracttextureimage.cpp \
diff --git a/src/render/backend/annotation.cpp b/src/render/materialsystem/annotation.cpp
index 2d725316a..2d725316a 100644
--- a/src/render/backend/annotation.cpp
+++ b/src/render/materialsystem/annotation.cpp
diff --git a/src/render/backend/annotation_p.h b/src/render/materialsystem/annotation_p.h
index 37c320abf..37c320abf 100644
--- a/src/render/backend/annotation_p.h
+++ b/src/render/materialsystem/annotation_p.h
diff --git a/src/render/backend/effect.cpp b/src/render/materialsystem/effect.cpp
index 37b73ffa6..37b73ffa6 100644
--- a/src/render/backend/effect.cpp
+++ b/src/render/materialsystem/effect.cpp
diff --git a/src/render/backend/effect_p.h b/src/render/materialsystem/effect_p.h
index 03e9f2d78..03e9f2d78 100644
--- a/src/render/backend/effect_p.h
+++ b/src/render/materialsystem/effect_p.h
diff --git a/src/render/backend/material.cpp b/src/render/materialsystem/material.cpp
index c096c1a98..c096c1a98 100644
--- a/src/render/backend/material.cpp
+++ b/src/render/materialsystem/material.cpp
diff --git a/src/render/backend/material_p.h b/src/render/materialsystem/material_p.h
index f1f5c6b38..f1f5c6b38 100644
--- a/src/render/backend/material_p.h
+++ b/src/render/materialsystem/material_p.h
diff --git a/src/render/materialsystem/materialsystem.pri b/src/render/materialsystem/materialsystem.pri
new file mode 100644
index 000000000..a52d2297f
--- /dev/null
+++ b/src/render/materialsystem/materialsystem.pri
@@ -0,0 +1,52 @@
+INCLUDEPATH += $$PWD
+
+HEADERS += \
+    $$PWD/annotation_p.h \
+    $$PWD/effect_p.h \
+    $$PWD/material_p.h \
+    $$PWD/parameter_p.h \
+    $$PWD/parametermapping_p.h \
+    $$PWD/qannotation.h \
+    $$PWD/qannotation_p.h \
+    $$PWD/qeffect.h \
+    $$PWD/qeffect_p.h \
+    $$PWD/qmaterial.h \
+    $$PWD/qmaterial_p.h \
+    $$PWD/qopenglfilter.h \
+    $$PWD/qparameter.h \
+    $$PWD/qparameter_p.h \
+    $$PWD/qparametermapping.h \
+    $$PWD/qparametermapping_p.h \
+    $$PWD/qrenderpass_p.h \
+    $$PWD/qrenderpass.h \
+    $$PWD/qshaderdata.h \
+    $$PWD/qshaderdata_p.h \
+    $$PWD/qshaderprogram.h \
+    $$PWD/qshaderprogram_p.h \
+    $$PWD/qtechnique.h \
+    $$PWD/qtechnique_p.h \
+    $$PWD/renderpass_p.h \
+    $$PWD/shader_p.h \
+    $$PWD/shaderdata_p.h \
+    $$PWD/technique_p.h
+
+SOURCES += \
+    $$PWD/annotation.cpp \
+    $$PWD/effect.cpp \
+    $$PWD/material.cpp \
+    $$PWD/parameter.cpp \
+    $$PWD/parametermapping.cpp \
+    $$PWD/qannotation.cpp \
+    $$PWD/qeffect.cpp \
+    $$PWD/qmaterial.cpp \
+    $$PWD/qopenglfilter.cpp \
+    $$PWD/qparameter.cpp \
+    $$PWD/qparametermapping.cpp \
+    $$PWD/qrenderpass.cpp \
+    $$PWD/qshaderdata.cpp \
+    $$PWD/qshaderprogram.cpp \
+    $$PWD/qtechnique.cpp \
+    $$PWD/renderpass.cpp \
+    $$PWD/shader.cpp \
+    $$PWD/shaderdata.cpp \
+    $$PWD/technique.cpp
diff --git a/src/render/backend/parameter.cpp b/src/render/materialsystem/parameter.cpp
index afc44ed58..afc44ed58 100644
--- a/src/render/backend/parameter.cpp
+++ b/src/render/materialsystem/parameter.cpp
diff --git a/src/render/backend/parameter_p.h b/src/render/materialsystem/parameter_p.h
index 4ea1cea37..4ea1cea37 100644
--- a/src/render/backend/parameter_p.h
+++ b/src/render/materialsystem/parameter_p.h
diff --git a/src/render/backend/parametermapping.cpp b/src/render/materialsystem/parametermapping.cpp
index a05d11b66..a05d11b66 100644
--- a/src/render/backend/parametermapping.cpp
+++ b/src/render/materialsystem/parametermapping.cpp
diff --git a/src/render/backend/parametermapping_p.h b/src/render/materialsystem/parametermapping_p.h
index ead8baf9a..ead8baf9a 100644
--- a/src/render/backend/parametermapping_p.h
+++ b/src/render/materialsystem/parametermapping_p.h
diff --git a/src/render/frontend/qannotation.cpp b/src/render/materialsystem/qannotation.cpp
index 85a46fcbe..85a46fcbe 100644
--- a/src/render/frontend/qannotation.cpp
+++ b/src/render/materialsystem/qannotation.cpp
diff --git a/src/render/frontend/qannotation.h b/src/render/materialsystem/qannotation.h
index 158ebdc77..158ebdc77 100644
--- a/src/render/frontend/qannotation.h
+++ b/src/render/materialsystem/qannotation.h
diff --git a/src/render/frontend/qannotation_p.h b/src/render/materialsystem/qannotation_p.h
index e61ee0c35..e61ee0c35 100644
--- a/src/render/frontend/qannotation_p.h
+++ b/src/render/materialsystem/qannotation_p.h
diff --git a/src/render/frontend/qeffect.cpp b/src/render/materialsystem/qeffect.cpp
index 443571872..443571872 100644
--- a/src/render/frontend/qeffect.cpp
+++ b/src/render/materialsystem/qeffect.cpp
diff --git a/src/render/frontend/qeffect.h b/src/render/materialsystem/qeffect.h
index 164a6392a..164a6392a 100644
--- a/src/render/frontend/qeffect.h
+++ b/src/render/materialsystem/qeffect.h
diff --git a/src/render/frontend/qeffect_p.h b/src/render/materialsystem/qeffect_p.h
index 7b9ca5b99..7b9ca5b99 100644
--- a/src/render/frontend/qeffect_p.h
+++ b/src/render/materialsystem/qeffect_p.h
diff --git a/src/render/frontend/qmaterial.cpp b/src/render/materialsystem/qmaterial.cpp
index b3c833556..b3c833556 100644
--- a/src/render/frontend/qmaterial.cpp
+++ b/src/render/materialsystem/qmaterial.cpp
diff --git a/src/render/frontend/qmaterial.h b/src/render/materialsystem/qmaterial.h
index ca44901c1..ca44901c1 100644
--- a/src/render/frontend/qmaterial.h
+++ b/src/render/materialsystem/qmaterial.h
diff --git a/src/render/frontend/qmaterial_p.h b/src/render/materialsystem/qmaterial_p.h
index 1ef84e05d..1ef84e05d 100644
--- a/src/render/frontend/qmaterial_p.h
+++ b/src/render/materialsystem/qmaterial_p.h
diff --git a/src/render/frontend/qopenglfilter.cpp b/src/render/materialsystem/qopenglfilter.cpp
index 3bc20a84d..3bc20a84d 100644
--- a/src/render/frontend/qopenglfilter.cpp
+++ b/src/render/materialsystem/qopenglfilter.cpp
diff --git a/src/render/frontend/qopenglfilter.h b/src/render/materialsystem/qopenglfilter.h
index 9c4b729bd..9c4b729bd 100644
--- a/src/render/frontend/qopenglfilter.h
+++ b/src/render/materialsystem/qopenglfilter.h
diff --git a/src/render/frontend/qparameter.cpp b/src/render/materialsystem/qparameter.cpp
index 96d1205df..96d1205df 100644
--- a/src/render/frontend/qparameter.cpp
+++ b/src/render/materialsystem/qparameter.cpp
diff --git a/src/render/frontend/qparameter.h b/src/render/materialsystem/qparameter.h
index 03883f5f1..03883f5f1 100644
--- a/src/render/frontend/qparameter.h
+++ b/src/render/materialsystem/qparameter.h
diff --git a/src/render/frontend/qparameter_p.h b/src/render/materialsystem/qparameter_p.h
index 0d3603d66..0d3603d66 100644
--- a/src/render/frontend/qparameter_p.h
+++ b/src/render/materialsystem/qparameter_p.h
diff --git a/src/render/frontend/qparametermapping.cpp b/src/render/materialsystem/qparametermapping.cpp
index 3890bf8b2..3890bf8b2 100644
--- a/src/render/frontend/qparametermapping.cpp
+++ b/src/render/materialsystem/qparametermapping.cpp
diff --git a/src/render/frontend/qparametermapping.h b/src/render/materialsystem/qparametermapping.h
index f4e209abd..f4e209abd 100644
--- a/src/render/frontend/qparametermapping.h
+++ b/src/render/materialsystem/qparametermapping.h
diff --git a/src/render/frontend/qparametermapping_p.h b/src/render/materialsystem/qparametermapping_p.h
index 0fe32cb0f..0fe32cb0f 100644
--- a/src/render/frontend/qparametermapping_p.h
+++ b/src/render/materialsystem/qparametermapping_p.h
diff --git a/src/render/frontend/qrenderpass.cpp b/src/render/materialsystem/qrenderpass.cpp
index efb315177..efb315177 100644
--- a/src/render/frontend/qrenderpass.cpp
+++ b/src/render/materialsystem/qrenderpass.cpp
diff --git a/src/render/frontend/qrenderpass.h b/src/render/materialsystem/qrenderpass.h
index ed733ba12..ed733ba12 100644
--- a/src/render/frontend/qrenderpass.h
+++ b/src/render/materialsystem/qrenderpass.h
diff --git a/src/render/frontend/qrenderpass_p.h b/src/render/materialsystem/qrenderpass_p.h
index ace1a54b1..ace1a54b1 100644
--- a/src/render/frontend/qrenderpass_p.h
+++ b/src/render/materialsystem/qrenderpass_p.h
diff --git a/src/render/frontend/qshaderdata.cpp b/src/render/materialsystem/qshaderdata.cpp
index 848b54bf8..848b54bf8 100644
--- a/src/render/frontend/qshaderdata.cpp
+++ b/src/render/materialsystem/qshaderdata.cpp
diff --git a/src/render/frontend/qshaderdata.h b/src/render/materialsystem/qshaderdata.h
index 4353581af..4353581af 100644
--- a/src/render/frontend/qshaderdata.h
+++ b/src/render/materialsystem/qshaderdata.h
diff --git a/src/render/frontend/qshaderdata_p.h b/src/render/materialsystem/qshaderdata_p.h
index eaf6847f7..eaf6847f7 100644
--- a/src/render/frontend/qshaderdata_p.h
+++ b/src/render/materialsystem/qshaderdata_p.h
diff --git a/src/render/frontend/qshaderprogram.cpp b/src/render/materialsystem/qshaderprogram.cpp
index 6c44ee0ce..6c44ee0ce 100644
--- a/src/render/frontend/qshaderprogram.cpp
+++ b/src/render/materialsystem/qshaderprogram.cpp
diff --git a/src/render/frontend/qshaderprogram.h b/src/render/materialsystem/qshaderprogram.h
index 6695316ee..6695316ee 100644
--- a/src/render/frontend/qshaderprogram.h
+++ b/src/render/materialsystem/qshaderprogram.h
diff --git a/src/render/frontend/qshaderprogram_p.h b/src/render/materialsystem/qshaderprogram_p.h
index 2fd50f3b0..2fd50f3b0 100644
--- a/src/render/frontend/qshaderprogram_p.h
+++ b/src/render/materialsystem/qshaderprogram_p.h
diff --git a/src/render/frontend/qtechnique.cpp b/src/render/materialsystem/qtechnique.cpp
index 52578e267..52578e267 100644
--- a/src/render/frontend/qtechnique.cpp
+++ b/src/render/materialsystem/qtechnique.cpp
diff --git a/src/render/frontend/qtechnique.h b/src/render/materialsystem/qtechnique.h
index d45892991..d45892991 100644
--- a/src/render/frontend/qtechnique.h
+++ b/src/render/materialsystem/qtechnique.h
diff --git a/src/render/frontend/qtechnique_p.h b/src/render/materialsystem/qtechnique_p.h
index 87fa18647..87fa18647 100644
--- a/src/render/frontend/qtechnique_p.h
+++ b/src/render/materialsystem/qtechnique_p.h
diff --git a/src/render/backend/renderpass.cpp b/src/render/materialsystem/renderpass.cpp
index b64b8682d..b64b8682d 100644
--- a/src/render/backend/renderpass.cpp
+++ b/src/render/materialsystem/renderpass.cpp
diff --git a/src/render/backend/renderpass_p.h b/src/render/materialsystem/renderpass_p.h
index ee9050055..ee9050055 100644
--- a/src/render/backend/renderpass_p.h
+++ b/src/render/materialsystem/renderpass_p.h
diff --git a/src/render/backend/shader.cpp b/src/render/materialsystem/shader.cpp
index 1a600bfbe..1a600bfbe 100644
--- a/src/render/backend/shader.cpp
+++ b/src/render/materialsystem/shader.cpp
diff --git a/src/render/backend/shader_p.h b/src/render/materialsystem/shader_p.h
index 7ff0cedea..7ff0cedea 100644
--- a/src/render/backend/shader_p.h
+++ b/src/render/materialsystem/shader_p.h
diff --git a/src/render/backend/shaderdata.cpp b/src/render/materialsystem/shaderdata.cpp
index 743ea1c60..743ea1c60 100644
--- a/src/render/backend/shaderdata.cpp
+++ b/src/render/materialsystem/shaderdata.cpp
diff --git a/src/render/backend/shaderdata_p.h b/src/render/materialsystem/shaderdata_p.h
index d09e5bac8..d09e5bac8 100644
--- a/src/render/backend/shaderdata_p.h
+++ b/src/render/materialsystem/shaderdata_p.h
diff --git a/src/render/backend/technique.cpp b/src/render/materialsystem/technique.cpp
index a3315f30e..a3315f30e 100644
--- a/src/render/backend/technique.cpp
+++ b/src/render/materialsystem/technique.cpp
diff --git a/src/render/backend/technique_p.h b/src/render/materialsystem/technique_p.h
index dbebe7fc9..dbebe7fc9 100644
--- a/src/render/backend/technique_p.h
+++ b/src/render/materialsystem/technique_p.h
diff --git a/src/render/render.pro b/src/render/render.pro
index 6682ddb01..94193243b 100644
--- a/src/render/render.pro
+++ b/src/render/render.pro
@@ -15,6 +15,7 @@ include (backend/render-backend.pri)
 include (geometry/geometry.pri)
 include (graphicshelpers/graphicshelpers.pri)
 include (frontend/render-frontend.pri)
+include (materialsystem/materialsystem.pri)
 include (renderstates/renderstates.pri)
 include (io/render-io.pri)
 include (defaults/defaults.pri)