Move texture classes to their own directory

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

23 files changed, 25 insertions, 19 deletions

diff --git a/src/render/backend/render-backend.pri b/src/render/backend/render-backend.pri
index 04b3a63c7..f40a12e84 100644
--- a/src/render/backend/render-backend.pri
+++ b/src/render/backend/render-backend.pri
@@ -12,7 +12,6 @@ HEADERS += \
     $$PWD/rendercommand_p.h \
     $$PWD/renderqueue_p.h \
     $$PWD/parameterpack_p.h \
-    $$PWD/texturedatamanager_p.h \
     $$PWD/rendertarget_p.h \
     $$PWD/renderattachment_p.h \
     $$PWD/scenemanager_p.h \
@@ -30,8 +29,6 @@ HEADERS += \
     $$PWD/layer_p.h \
     $$PWD/nodefunctor_p.h \
     $$PWD/scene_p.h \
-    $$PWD/texture_p.h \
-    $$PWD/textureimage_p.h \
     $$PWD/transform_p.h
 
 SOURCES += \
@@ -43,7 +40,6 @@ SOURCES += \
     $$PWD/rendercommand.cpp \
     $$PWD/renderqueue.cpp \
     $$PWD/parameterpack.cpp \
-    $$PWD/texturedatamanager.cpp \
     $$PWD/rendertarget.cpp \
     $$PWD/renderattachment.cpp \
     $$PWD/scenemanager.cpp \
@@ -55,6 +51,4 @@ SOURCES += \
     $$PWD/entity.cpp \
     $$PWD/layer.cpp \
     $$PWD/scene.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 c3fb519fe..9c4f421ab 100644
--- a/src/render/frontend/render-frontend.pri
+++ b/src/render/frontend/render-frontend.pri
@@ -6,7 +6,6 @@ HEADERS += \
     $$PWD/qrenderaspect.h \
     $$PWD/qrenderaspect_p.h \
     $$PWD/qitemmodelbuffer.h \
-    $$PWD/qtexture.h \
     $$PWD/sphere.h \
     $$PWD/qabstractsceneloader.h \
     $$PWD/qsceneloader.h \
@@ -17,13 +16,6 @@ HEADERS += \
     $$PWD/qrenderattachment_p.h \
     $$PWD/qrendertarget.h \
     $$PWD/qrendertarget_p.h \
-    $$PWD/qabstracttextureprovider.h \
-    $$PWD/qabstracttextureprovider_p.h \
-    $$PWD/qwrapmode.h \
-    $$PWD/qabstracttextureimage.h \
-    $$PWD/qabstracttextureimage_p.h \
-    $$PWD/qtextureimage.h \
-    $$PWD/qtextureproviders.h \
     $$PWD/qwindow.h \
     $$PWD/qwindow_p.h
 
@@ -36,9 +28,4 @@ SOURCES += \
     $$PWD/qlayer.cpp \
     $$PWD/qrenderattachment.cpp \
     $$PWD/qrendertarget.cpp \
-    $$PWD/qabstracttextureprovider.cpp \
-    $$PWD/qwrapmode.cpp \
-    $$PWD/qabstracttextureimage.cpp \
-    $$PWD/qtextureimage.cpp \
-    $$PWD/qtextureproviders.cpp \
     $$PWD/qwindow.cpp
diff --git a/src/render/render.pro b/src/render/render.pro
index d32e3c335..965e7c189 100644
--- a/src/render/render.pro
+++ b/src/render/render.pro
@@ -20,6 +20,7 @@ include (materialsystem/materialsystem.pri)
 include (renderstates/renderstates.pri)
 include (io/render-io.pri)
 include (defaults/defaults.pri)
+include (texture/texture.pri)
 
 RESOURCES += $$PWD/render.qrc
 
diff --git a/src/render/frontend/qabstracttextureimage.cpp b/src/render/texture/qabstracttextureimage.cpp
index 5f44090d4..5f44090d4 100644
--- a/src/render/frontend/qabstracttextureimage.cpp
+++ b/src/render/texture/qabstracttextureimage.cpp
diff --git a/src/render/frontend/qabstracttextureimage.h b/src/render/texture/qabstracttextureimage.h
index 24efd2508..24efd2508 100644
--- a/src/render/frontend/qabstracttextureimage.h
+++ b/src/render/texture/qabstracttextureimage.h
diff --git a/src/render/frontend/qabstracttextureimage_p.h b/src/render/texture/qabstracttextureimage_p.h
index a56cd7573..a56cd7573 100644
--- a/src/render/frontend/qabstracttextureimage_p.h
+++ b/src/render/texture/qabstracttextureimage_p.h
diff --git a/src/render/frontend/qabstracttextureprovider.cpp b/src/render/texture/qabstracttextureprovider.cpp
index 34259b511..34259b511 100644
--- a/src/render/frontend/qabstracttextureprovider.cpp
+++ b/src/render/texture/qabstracttextureprovider.cpp
diff --git a/src/render/frontend/qabstracttextureprovider.h b/src/render/texture/qabstracttextureprovider.h
index 4a8e3adde..4a8e3adde 100644
--- a/src/render/frontend/qabstracttextureprovider.h
+++ b/src/render/texture/qabstracttextureprovider.h
diff --git a/src/render/frontend/qabstracttextureprovider_p.h b/src/render/texture/qabstracttextureprovider_p.h
index c6516904c..c6516904c 100644
--- a/src/render/frontend/qabstracttextureprovider_p.h
+++ b/src/render/texture/qabstracttextureprovider_p.h
diff --git a/src/render/frontend/qtexture.h b/src/render/texture/qtexture.h
index d794f5b08..d794f5b08 100644
--- a/src/render/frontend/qtexture.h
+++ b/src/render/texture/qtexture.h
diff --git a/src/render/frontend/qtextureimage.cpp b/src/render/texture/qtextureimage.cpp
index 3d8a58b3e..3d8a58b3e 100644
--- a/src/render/frontend/qtextureimage.cpp
+++ b/src/render/texture/qtextureimage.cpp
diff --git a/src/render/frontend/qtextureimage.h b/src/render/texture/qtextureimage.h
index f77c2d47e..f77c2d47e 100644
--- a/src/render/frontend/qtextureimage.h
+++ b/src/render/texture/qtextureimage.h
diff --git a/src/render/frontend/qtextureproviders.cpp b/src/render/texture/qtextureproviders.cpp
index 62c8f66c7..62c8f66c7 100644
--- a/src/render/frontend/qtextureproviders.cpp
+++ b/src/render/texture/qtextureproviders.cpp
diff --git a/src/render/frontend/qtextureproviders.h b/src/render/texture/qtextureproviders.h
index dc54b7999..dc54b7999 100644
--- a/src/render/frontend/qtextureproviders.h
+++ b/src/render/texture/qtextureproviders.h
diff --git a/src/render/frontend/qwrapmode.cpp b/src/render/texture/qwrapmode.cpp
index 2e5ace4d2..2e5ace4d2 100644
--- a/src/render/frontend/qwrapmode.cpp
+++ b/src/render/texture/qwrapmode.cpp
diff --git a/src/render/frontend/qwrapmode.h b/src/render/texture/qwrapmode.h
index 6254fe5bf..6254fe5bf 100644
--- a/src/render/frontend/qwrapmode.h
+++ b/src/render/texture/qwrapmode.h
diff --git a/src/render/backend/texture.cpp b/src/render/texture/texture.cpp
index 9ac0966ce..9ac0966ce 100644
--- a/src/render/backend/texture.cpp
+++ b/src/render/texture/texture.cpp
diff --git a/src/render/texture/texture.pri b/src/render/texture/texture.pri
new file mode 100644
index 000000000..adc07dcd9
--- /dev/null
+++ b/src/render/texture/texture.pri
@@ -0,0 +1,24 @@
+INCLUDEPATH += $$PWD
+
+HEADERS += \
+    $$PWD/qabstracttextureimage.h \
+    $$PWD/qabstracttextureimage_p.h \
+    $$PWD/qabstracttextureprovider.h \
+    $$PWD/qabstracttextureprovider_p.h \
+    $$PWD/qtexture.h \
+    $$PWD/qtextureimage.h \
+    $$PWD/qtextureproviders.h \
+    $$PWD/qwrapmode.h \
+    $$PWD/texture_p.h \
+    $$PWD/texturedatamanager_p.h \
+    $$PWD/textureimage_p.h
+
+SOURCES += \
+    $$PWD/qabstracttextureimage.cpp \
+    $$PWD/qabstracttextureprovider.cpp \
+    $$PWD/qtextureimage.cpp \
+    $$PWD/qtextureproviders.cpp \
+    $$PWD/qwrapmode.cpp \
+    $$PWD/texture.cpp \
+    $$PWD/texturedatamanager.cpp \
+    $$PWD/textureimage.cpp
diff --git a/src/render/backend/texture_p.h b/src/render/texture/texture_p.h
index 522343c68..522343c68 100644
--- a/src/render/backend/texture_p.h
+++ b/src/render/texture/texture_p.h
diff --git a/src/render/backend/texturedatamanager.cpp b/src/render/texture/texturedatamanager.cpp
index 3e77179f6..3e77179f6 100644
--- a/src/render/backend/texturedatamanager.cpp
+++ b/src/render/texture/texturedatamanager.cpp
diff --git a/src/render/backend/texturedatamanager_p.h b/src/render/texture/texturedatamanager_p.h
index 734e9049c..734e9049c 100644
--- a/src/render/backend/texturedatamanager_p.h
+++ b/src/render/texture/texturedatamanager_p.h
diff --git a/src/render/backend/textureimage.cpp b/src/render/texture/textureimage.cpp
index 4625586bf..4625586bf 100644
--- a/src/render/backend/textureimage.cpp
+++ b/src/render/texture/textureimage.cpp
diff --git a/src/render/backend/textureimage_p.h b/src/render/texture/textureimage_p.h
index 4964eb416..4964eb416 100644
--- a/src/render/backend/textureimage_p.h
+++ b/src/render/texture/textureimage_p.h