aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/scenegraph/util
diff options
context:
space:
mode:
authorEirik Aavitsland <eirik.aavitsland@qt.io>2017-12-06 16:24:53 +0100
committerTony Sarajärvi <tony.sarajarvi@qt.io>2018-02-01 06:39:27 +0000
commitf6a5820cc1f268436eb8074531002790bc214df7 (patch)
tree2ab687aab6eee46961e55bd1d84557454fa25bb7 /src/quick/scenegraph/util
parentf5abe488f1e7c9c31badd0622b7374648bea943a (diff)
Add basic handler for ktx format texture files
This adds basic support for reading compressed textures stored in .ktx files, the Khronos texture file format. Change-Id: Iafb86cff9607eedb26a73989f9b005455ddd316f Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/quick/scenegraph/util')
-rw-r--r--src/quick/scenegraph/util/qsgtexturereader.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quick/scenegraph/util/qsgtexturereader.cpp b/src/quick/scenegraph/util/qsgtexturereader.cpp
index cf4edf29b8..168afb9e56 100644
--- a/src/quick/scenegraph/util/qsgtexturereader.cpp
+++ b/src/quick/scenegraph/util/qsgtexturereader.cpp
@@ -43,6 +43,7 @@
#if QT_CONFIG(opengl)
#include <private/qsgpkmhandler_p.h>
+#include <private/qsgktxhandler_p.h>
#endif
#include <QFileInfo>
@@ -80,6 +81,8 @@ bool QSGTextureReader::isTexture()
// Currently the handlers are hardcoded; later maybe a list of plugins
if (QSGPkmHandler::canRead(suffix, headerBlock)) {
m_handler = new QSGPkmHandler(m_device, logName);
+ } else if (QSGKtxHandler::canRead(suffix, headerBlock)) {
+ m_handler = new QSGKtxHandler(m_device, logName);
}
// else if OtherHandler::canRead() ...etc.
}