From 731538fdd469452e721b568fcbd808b437332008 Mon Sep 17 00:00:00 2001 From: Eirik Aavitsland Date: Tue, 3 Jul 2018 12:30:46 +0200 Subject: Add API for reading and decoding graphical texture files Add a framework for reading and decoding stored graphical texture file formats. Includes decoders for the PKM and KTX formats. This is basically the same texture file reading that was added to qtdeclarative for 5.11, but has been refactored to be independent of the scenegraph and opengl. Task-number: QTBUG-67026 Change-Id: I87d8117550d8a2112f4f58c03e9ac6b3249cbc5a Reviewed-by: Kai Koehne Reviewed-by: Laszlo Agocs --- .../util/qtexturefilereader/qtexturefilereader.pro | 5 ++ .../util/qtexturefilereader/qtexturefilereader.qrc | 6 ++ .../util/qtexturefilereader/texturefiles/car.ktx | Bin 0 -> 11908 bytes .../qtexturefilereader/texturefiles/pattern.pkm | Bin 0 -> 2064 bytes .../qtexturefilereader/tst_qtexturefilereader.cpp | 97 +++++++++++++++++++++ 5 files changed, 108 insertions(+) create mode 100644 tests/auto/gui/util/qtexturefilereader/qtexturefilereader.pro create mode 100644 tests/auto/gui/util/qtexturefilereader/qtexturefilereader.qrc create mode 100644 tests/auto/gui/util/qtexturefilereader/texturefiles/car.ktx create mode 100644 tests/auto/gui/util/qtexturefilereader/texturefiles/pattern.pkm create mode 100644 tests/auto/gui/util/qtexturefilereader/tst_qtexturefilereader.cpp (limited to 'tests/auto/gui/util/qtexturefilereader') diff --git a/tests/auto/gui/util/qtexturefilereader/qtexturefilereader.pro b/tests/auto/gui/util/qtexturefilereader/qtexturefilereader.pro new file mode 100644 index 0000000000..43951fe722 --- /dev/null +++ b/tests/auto/gui/util/qtexturefilereader/qtexturefilereader.pro @@ -0,0 +1,5 @@ +CONFIG += testcase +QT += testlib gui-private +SOURCES += tst_qtexturefilereader.cpp +TARGET = tst_qtexturefilereader +RESOURCES += qtexturefilereader.qrc diff --git a/tests/auto/gui/util/qtexturefilereader/qtexturefilereader.qrc b/tests/auto/gui/util/qtexturefilereader/qtexturefilereader.qrc new file mode 100644 index 0000000000..74f33d57ad --- /dev/null +++ b/tests/auto/gui/util/qtexturefilereader/qtexturefilereader.qrc @@ -0,0 +1,6 @@ + + + texturefiles/car.ktx + texturefiles/pattern.pkm + + diff --git a/tests/auto/gui/util/qtexturefilereader/texturefiles/car.ktx b/tests/auto/gui/util/qtexturefilereader/texturefiles/car.ktx new file mode 100644 index 0000000000..2aefdd306b Binary files /dev/null and b/tests/auto/gui/util/qtexturefilereader/texturefiles/car.ktx differ diff --git a/tests/auto/gui/util/qtexturefilereader/texturefiles/pattern.pkm b/tests/auto/gui/util/qtexturefilereader/texturefiles/pattern.pkm new file mode 100644 index 0000000000..d986e89b2d Binary files /dev/null and b/tests/auto/gui/util/qtexturefilereader/texturefiles/pattern.pkm differ diff --git a/tests/auto/gui/util/qtexturefilereader/tst_qtexturefilereader.cpp b/tests/auto/gui/util/qtexturefilereader/tst_qtexturefilereader.cpp new file mode 100644 index 0000000000..f480184067 --- /dev/null +++ b/tests/auto/gui/util/qtexturefilereader/tst_qtexturefilereader.cpp @@ -0,0 +1,97 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include + +class tst_qtexturefilereader : public QObject +{ + Q_OBJECT + +private slots: + void checkHandlers_data(); + void checkHandlers(); +}; + +void tst_qtexturefilereader::checkHandlers_data() +{ + QTest::addColumn("fileName"); + QTest::addColumn("size"); + QTest::addColumn("glFormat"); + QTest::addColumn("glInternalFormat"); + // todo: glBaseInternalFormat + QTest::addColumn("levels"); + QTest::addColumn("dataOffset"); + QTest::addColumn("dataLength"); + + QTest::addRow("pattern.pkm") << QStringLiteral(":/texturefiles/pattern.pkm") + << QSize(64, 64) + << quint32(0x0) + << quint32(0x8d64) + << 1 + << 16 + << 2048; + + QTest::addRow("car.ktx") << QStringLiteral(":/texturefiles/car.ktx") + << QSize(146, 80) + << quint32(0x0) + << quint32(0x9278) + << 1 + << 68 + << 11840; +} + +void tst_qtexturefilereader::checkHandlers() +{ + QFETCH(QString, fileName); + QFETCH(QSize, size); + QFETCH(quint32, glFormat); + QFETCH(quint32, glInternalFormat); + QFETCH(int, levels); + QFETCH(int, dataOffset); + QFETCH(int, dataLength); + + QFile f(fileName); + QVERIFY(f.open(QIODevice::ReadOnly)); + QTextureFileReader r(&f, fileName); + QVERIFY(r.canRead()); + + QTextureFileData tex = r.read(); + QVERIFY(!tex.isNull()); + QVERIFY(tex.isValid()); + QCOMPARE(tex.size(), size); + QCOMPARE(tex.glFormat(), glFormat); + QCOMPARE(tex.glInternalFormat(), glInternalFormat); + QCOMPARE(tex.numLevels(), levels); + QCOMPARE(tex.dataOffset(), dataOffset); + QCOMPARE(tex.dataLength(), dataLength); +} + +QTEST_MAIN(tst_qtexturefilereader) + +#include "tst_qtexturefilereader.moc" -- cgit v1.2.3