Texture backend refactoring: LoadTextureDataJob is now slim

Texture property setting was done inside the LoadTextureDataJob.
Now it is properly done in GLTexture, where it belongs. This simplifies
the LoadTextureDataJob to its absolute minimum: load texture data.

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

1 files changed, 8 insertions, 3 deletions

diff --git a/src/render/jobs/loadtexturedatajob_p.h b/src/render/jobs/loadtexturedatajob_p.h
index db2521354..36fdd950b 100644
--- a/src/render/jobs/loadtexturedatajob_p.h
+++ b/src/render/jobs/loadtexturedatajob_p.h
@@ -53,7 +53,8 @@
 
 #include <Qt3DCore/qnodeid.h>
 #include <Qt3DCore/qaspectjob.h>
-#include <Qt3DRender/qtextureimage.h>
+#include <Qt3DRender/qtexturegenerator.h>
+#include <Qt3DRender/qtextureimagedatagenerator.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -66,15 +67,19 @@ class NodeManagers;
 class LoadTextureDataJob : public Qt3DCore::QAspectJob
 {
 public:
-    explicit LoadTextureDataJob(Qt3DCore::QNodeId textureId);
+    LoadTextureDataJob(const QTextureGeneratorPtr &texGen);
+    LoadTextureDataJob(const QTextureImageDataGeneratorPtr &imgDataGen);
     ~LoadTextureDataJob();
+
     inline void setNodeManagers(NodeManagers *manager) { m_manager = manager; }
 
 protected:
     void run() Q_DECL_FINAL;
 
 private:
-    Qt3DCore::QNodeId m_textureId;
+    QTextureGeneratorPtr m_texGen;
+    QTextureImageDataGeneratorPtr  m_imgDataGen;
+
     NodeManagers *m_manager;
 };