Fix: Do not enforce TextureImage to be parented only by Texture

This behavior prevented using TextureImage not directly parented by the
Texture that uses them (assert would be triggered). In turn, this also
prevents sharing a TextureImage among several Texture instances which is
counter productive since this is where the data is actually stored.

This patch fixes this issue. It removes all direct coupling between Texture
and TextureImages. Now Texture only contains the list of TextureImage ids it
references. This allows to not make look-ups into the TextureImageManager to
retrieve handles, which could be an issue if TextureImages have not yet had
their backend created. TextureImage doesn't keep track of the referencing texture
that uses it anymore. Instead, we let the renderer do the job of checking if any of
the TextureImage referenced by a Texture has changed to trigger actual Texture
update.

Change-Id: I3c63379d0f4b314e9b53f225870eeaded0bb4aec
Task-number: QTBUG-69407
Reviewed-by: Mike Krus <mike.krus@kdab.com>

1 files changed, 3 insertions, 6 deletions

diff --git a/src/render/texture/textureimage_p.h b/src/render/texture/textureimage_p.h
index b7a1fae8e..19801ee77 100644
--- a/src/render/texture/textureimage_p.h
+++ b/src/render/texture/textureimage_p.h
@@ -78,10 +78,8 @@ public:
 
     void cleanup();
 
-    void setTextureManager(TextureManager *manager) { m_textureManager = manager; }
     void setTextureImageDataManager(TextureImageDataManager *dataManager) { m_textureImageDataManager = dataManager; }
 
-    TextureManager *textureManager() const { return m_textureManager; }
     TextureImageDataManager *textureImageDataManager() const { return m_textureImageDataManager; }
 
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
@@ -90,25 +88,25 @@ public:
     inline int mipLevel() const { return m_mipLevel; }
     inline QAbstractTexture::CubeMapFace face() const { return m_face; }
     inline QTextureImageDataGeneratorPtr dataGenerator() const { return m_generator; }
+    inline bool isDirty() const { return m_dirty; }
+    void unsetDirty();
 
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
 
+    bool m_dirty;
     int m_layer;
     int m_mipLevel;
     QAbstractTexture::CubeMapFace m_face;
     QTextureImageDataGeneratorPtr m_generator;
 
-    TextureManager *m_textureManager;
     TextureImageDataManager *m_textureImageDataManager;
-    HTexture m_textureProvider;
 };
 
 class TextureImageFunctor : public Qt3DCore::QBackendNodeMapper
 {
 public:
     explicit TextureImageFunctor(AbstractRenderer *renderer,
-                                 TextureManager *textureManager,
                                  TextureImageManager *textureImageManager,
                                  TextureImageDataManager *textureImageDataManager);
 
@@ -118,7 +116,6 @@ public:
 
 private:
     AbstractRenderer *m_renderer;
-    TextureManager *m_textureManager;
     TextureImageManager *m_textureImageManager;
     TextureImageDataManager *m_textureImageDataManager;
 };