aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/scenegraph/compressedtexture/qsgcompressedtexture_p.h
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@live.com>2017-11-07 20:07:34 -0600
committerSimon Hausmann <simon.hausmann@qt.io>2018-01-31 08:13:31 +0000
commit07f9ca1759e35f1eb497fe2f1ad4b7ba71b69b5c (patch)
tree5dd23f1f31ac3df199572c3add1f25972ec4ec69 /src/quick/scenegraph/compressedtexture/qsgcompressedtexture_p.h
parenteace041161a03a849d3896af65493b7885cecc04 (diff)
Basic working compressed texture atlas
This adds experimental automatic atlasing of ETC-compressed textures (to be expanded to additional formats), similar to existing atlas support of QImages. It is off by default, and can be enabled with QSG_ENABLE_COMPRESSED_ATLAS=1. [ChangeLog] Add experimental automatic atlasing of ETC-compressed textures (can be enabled with QSG_ENABLE_COMPRESSED_ATLAS=1) Change-Id: Ia66971f51299d082a569bdfaadb662a3e522bd79 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/quick/scenegraph/compressedtexture/qsgcompressedtexture_p.h')
-rw-r--r--src/quick/scenegraph/compressedtexture/qsgcompressedtexture_p.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/quick/scenegraph/compressedtexture/qsgcompressedtexture_p.h b/src/quick/scenegraph/compressedtexture/qsgcompressedtexture_p.h
index dfedac5558..aa87316809 100644
--- a/src/quick/scenegraph/compressedtexture/qsgcompressedtexture_p.h
+++ b/src/quick/scenegraph/compressedtexture/qsgcompressedtexture_p.h
@@ -103,6 +103,9 @@ protected:
bool m_uploaded = false;
};
+namespace QSGAtlasTexture {
+ class Manager;
+}
class Q_QUICK_PRIVATE_EXPORT QSGCompressedTextureFactory : public QQuickTextureFactory
{
@@ -114,6 +117,8 @@ public:
protected:
QSGCompressedTexture::DataPtr m_textureData;
+private:
+ friend class QSGAtlasTexture::Manager;
};
QT_END_NAMESPACE