1 files changed, 61 insertions, 27 deletions

diff --git a/src/quick/scenegraph/util/qsgatlastexture_p.h b/src/quick/scenegraph/util/qsgatlastexture_p.h
index 3dee539547..14dc8f7958 100644
--- a/src/quick/scenegraph/util/qsgatlastexture_p.h
+++ b/src/quick/scenegraph/util/qsgatlastexture_p.h
@@ -61,10 +61,16 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QSGCompressedAtlasTexture {
+    class Atlas;
+}
+class QSGCompressedTextureFactory;
+
 namespace QSGAtlasTexture
 {
 
 class Texture;
+class TextureBase;
 class Atlas;
 
 class Manager : public QObject
@@ -76,93 +82,121 @@ public:
     ~Manager();
 
     QSGTexture *create(const QImage &image, bool hasAlphaChannel);
+    QSGTexture *create(const QSGCompressedTextureFactory *factory);
     void invalidate();
 
 private:
     Atlas *m_atlas;
+    // set of atlases for different compressed formats
+    QHash<unsigned int, QSGCompressedAtlasTexture::Atlas*> m_atlases;
 
     QSize m_atlas_size;
     int m_atlas_size_limit;
 };
 
-class Atlas : public QObject
+class AtlasBase : public QObject
 {
+    Q_OBJECT
 public:
-    Atlas(const QSize &size);
-    ~Atlas();
+    AtlasBase(const QSize &size);
+    ~AtlasBase();
 
     void invalidate();
 
     int textureId() const;
     void bind(QSGTexture::Filtering filtering);
 
+    void remove(TextureBase *t);
+
+    QSize size() const { return m_size; }
+
+protected:
+    virtual void generateTexture() = 0;
+    virtual void uploadPendingTexture(int i) = 0;
+
+protected:
+    QSGAreaAllocator m_allocator;
+    unsigned int m_texture_id;
+    QSize m_size;
+    QList<TextureBase *> m_pending_uploads;
+
+private:
+    bool m_allocated;
+};
+
+class Atlas : public AtlasBase
+{
+public:
+    Atlas(const QSize &size);
+    ~Atlas();
+
+    void generateTexture() override;
+    void uploadPendingTexture(int i) override;
+
     void upload(Texture *texture);
     void uploadBgra(Texture *texture);
 
     Texture *create(const QImage &image);
-    void remove(Texture *t);
-
-    QSize size() const { return m_size; }
 
     uint internalFormat() const { return m_internalFormat; }
     uint externalFormat() const { return m_externalFormat; }
 
 private:
-    QSGAreaAllocator m_allocator;
-    unsigned int m_texture_id;
-    QSize m_size;
-    QList<Texture *> m_pending_uploads;
-
     uint m_internalFormat;
     uint m_externalFormat;
 
     int m_atlas_transient_image_threshold;
 
-    uint m_allocated : 1;
     uint m_use_bgra_fallback: 1;
-
     uint m_debug_overlay : 1;
 };
 
-class Texture : public QSGTexture
+class TextureBase : public QSGTexture
+{
+    Q_OBJECT
+public:
+    TextureBase(AtlasBase *atlas, const QRect &textureRect);
+    ~TextureBase();
+
+    int textureId() const override { return m_atlas->textureId(); }
+    bool isAtlasTexture() const override { return true; }
+
+    QRect atlasSubRect() const { return m_allocated_rect; }
+
+    void bind() override;
+
+protected:
+    QRect m_allocated_rect;
+    AtlasBase *m_atlas;
+};
+
+class Texture : public TextureBase
 {
     Q_OBJECT
 public:
     Texture(Atlas *atlas, const QRect &textureRect, const QImage &image);
     ~Texture();
 
-    int textureId() const override { return m_atlas->textureId(); }
     QSize textureSize() const override { return atlasSubRectWithoutPadding().size(); }
     void setHasAlphaChannel(bool alpha) { m_has_alpha = alpha; }
     bool hasAlphaChannel() const override { return m_has_alpha; }
     bool hasMipmaps() const override { return false; }
-    bool isAtlasTexture() const override { return true; }
 
     QRectF normalizedTextureSubRect() const override { return m_texture_coords_rect; }
 
     QRect atlasSubRect() const { return m_allocated_rect; }
     QRect atlasSubRectWithoutPadding() const { return m_allocated_rect.adjusted(1, 1, -1, -1); }
 
-    bool isTexture() const { return true; }
-
     QSGTexture *removedFromAtlas() const override;
 
     void releaseImage() { m_image = QImage(); }
     const QImage &image() const { return m_image; }
 
-    void bind() override;
-
 private:
-    QRect m_allocated_rect;
     QRectF m_texture_coords_rect;
-
     QImage m_image;
-
-    Atlas *m_atlas;
-
     mutable QSGPlainTexture *m_nonatlas_texture;
-
-    uint m_has_alpha : 1;
+    bool m_has_alpha;
 };
 
 }