summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/render/texture/texture.cpp20
-rw-r--r--src/render/texture/texture_p.h7
-rw-r--r--tests/auto/render/render.pro1
-rw-r--r--tests/auto/render/texture/texture.pro12
-rw-r--r--tests/auto/render/texture/tst_texture.cpp235
5 files changed, 274 insertions, 1 deletions
diff --git a/src/render/texture/texture.cpp b/src/render/texture/texture.cpp
index f771fb54a..afb5ecc1f 100644
--- a/src/render/texture/texture.cpp
+++ b/src/render/texture/texture.cpp
@@ -533,6 +533,26 @@ void Texture::setLayers(int layers)
}
}
+int Texture::width() const
+{
+ return m_width;
+}
+
+int Texture::height() const
+{
+ return m_height;
+}
+
+int Texture::depth() const
+{
+ return m_depth;
+}
+
+int Texture::layers() const
+{
+ return m_layers;
+}
+
// ChangeArbiter/Aspect Thread
void Texture::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
{
diff --git a/src/render/texture/texture_p.h b/src/render/texture/texture_p.h
index f578cfd29..7ac09bae5 100644
--- a/src/render/texture/texture_p.h
+++ b/src/render/texture/texture_p.h
@@ -75,7 +75,7 @@ class TextureDataManager;
typedef quint64 TextureDNA;
-class Texture : public BackendNode
+class Q_AUTOTEST_EXPORT Texture : public BackendNode
{
public:
Texture();
@@ -107,6 +107,11 @@ public:
void setMipLevels(int mipmapLevels);
void setLayers(int layers);
+ int width() const;
+ int height() const;
+ int depth() const;
+ int layers() const;
+
inline QVector<HTextureImage> textureImages() const { return m_textureImages; }
inline QAbstractTexture::TextureFormat format() const { return m_format; }
inline QAbstractTexture::Target target() const { return m_target; }
diff --git a/tests/auto/render/render.pro b/tests/auto/render/render.pro
index be5a39d2c..3c9f4d462 100644
--- a/tests/auto/render/render.pro
+++ b/tests/auto/render/render.pro
@@ -7,6 +7,7 @@ contains(QT_CONFIG, private_tests) {
renderpass \
qgraphicsutils \
shader \
+ texture \
renderviewutils \
renderviews \
material \
diff --git a/tests/auto/render/texture/texture.pro b/tests/auto/render/texture/texture.pro
new file mode 100644
index 000000000..04231844f
--- /dev/null
+++ b/tests/auto/render/texture/texture.pro
@@ -0,0 +1,12 @@
+TEMPLATE = app
+
+TARGET = tst_texture
+
+QT += core-private 3dcore 3dcore-private 3drender 3drender-private testlib
+
+CONFIG += testcase
+
+SOURCES += tst_texture.cpp
+
+include(../../core/common/common.pri)
+include(../commons/commons.pri)
diff --git a/tests/auto/render/texture/tst_texture.cpp b/tests/auto/render/texture/tst_texture.cpp
new file mode 100644
index 000000000..0594909c1
--- /dev/null
+++ b/tests/auto/render/texture/tst_texture.cpp
@@ -0,0 +1,235 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt3D module 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 <QtTest/QTest>
+#include <qbackendnodetester.h>
+#include <Qt3DCore/qdynamicpropertyupdatedchange.h>
+#include <Qt3DRender/private/texture_p.h>
+
+#include "testpostmanarbiter.h"
+#include "testrenderer.h"
+
+class DummyTexture : public Qt3DRender::QAbstractTexture
+{
+ Q_OBJECT
+
+public:
+ explicit DummyTexture(Qt3DCore::QNode *parent = nullptr)
+ : QAbstractTexture(TargetAutomatic, parent)
+ {
+ }
+};
+
+class tst_RenderTexture : public Qt3DCore::QBackendNodeTester
+{
+ Q_OBJECT
+
+private:
+ template <typename FrontendTextureType, Qt3DRender::QAbstractTexture::Target Target>
+ void checkPropertyMirroring();
+
+private slots:
+ void checkFrontendPropertyNotifications();
+ void checkPropertyMirroring();
+ void checkPropertyChanges();
+};
+
+void tst_RenderTexture::checkFrontendPropertyNotifications()
+{
+ // GIVEN
+ TestArbiter arbiter;
+ DummyTexture texture;
+ arbiter.setArbiterOnNode(&texture);
+
+ // WHEN
+ texture.setWidth(512);
+ QCoreApplication::processEvents();
+
+ // THEN
+ QCOMPARE(arbiter.events.size(), 1);
+ Qt3DCore::QPropertyUpdatedChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QPropertyUpdatedChange>();
+ QCOMPARE(change->propertyName(), "width");
+ QCOMPARE(change->value().value<int>(), 512);
+ QCOMPARE(change->type(), Qt3DCore::PropertyUpdated);
+
+ arbiter.events.clear();
+
+ // WHEN
+ texture.setWidth(512);
+ QCoreApplication::processEvents();
+
+ // THEN
+ QCOMPARE(arbiter.events.size(), 0);
+
+ // WHEN
+ texture.setHeight(256);
+ QCoreApplication::processEvents();
+
+ // THEN
+ QCOMPARE(arbiter.events.size(), 1);
+ change = arbiter.events.first().staticCast<Qt3DCore::QPropertyUpdatedChange>();
+ QCOMPARE(change->propertyName(), "height");
+ QCOMPARE(change->value().value<int>(), 256);
+ QCOMPARE(change->type(), Qt3DCore::PropertyUpdated);
+
+ arbiter.events.clear();
+
+ // WHEN
+ texture.setHeight(256);
+ QCoreApplication::processEvents();
+
+ // THEN
+ QCOMPARE(arbiter.events.size(), 0);
+
+ // WHEN
+ texture.setDepth(128);
+ QCoreApplication::processEvents();
+
+ // THEN
+ QCOMPARE(arbiter.events.size(), 1);
+ change = arbiter.events.first().staticCast<Qt3DCore::QPropertyUpdatedChange>();
+ QCOMPARE(change->propertyName(), "depth");
+ QCOMPARE(change->value().value<int>(), 128);
+ QCOMPARE(change->type(), Qt3DCore::PropertyUpdated);
+
+ arbiter.events.clear();
+
+ // WHEN
+ texture.setDepth(128);
+ QCoreApplication::processEvents();
+
+ // THEN
+ QCOMPARE(arbiter.events.size(), 0);
+
+ // WHEN
+ texture.setLayers(16);
+ QCoreApplication::processEvents();
+
+ // THEN
+ QCOMPARE(arbiter.events.size(), 1);
+ change = arbiter.events.first().staticCast<Qt3DCore::QPropertyUpdatedChange>();
+ QCOMPARE(change->propertyName(), "layers");
+ QCOMPARE(change->value().value<int>(), 16);
+ QCOMPARE(change->type(), Qt3DCore::PropertyUpdated);
+
+ arbiter.events.clear();
+
+ // WHEN
+ texture.setLayers(16);
+ QCoreApplication::processEvents();
+
+ // THEN
+ QCOMPARE(arbiter.events.size(), 0);
+}
+
+template <typename FrontendTextureType, Qt3DRender::QAbstractTexture::Target Target>
+void tst_RenderTexture::checkPropertyMirroring()
+{
+ // GIVEN
+ Qt3DRender::Render::Texture backend;
+
+ FrontendTextureType frontend;
+ frontend.setWidth(256);
+ frontend.setHeight(128);
+ frontend.setDepth(16);
+ frontend.setLayers(8);
+
+ // WHEN
+ simulateInitialization(&frontend, &backend);
+
+ // THEN
+ QCOMPARE(backend.peerId(), frontend.id());
+ QCOMPARE(backend.target(), Target);
+ QCOMPARE(backend.width(), frontend.width());
+ QCOMPARE(backend.height(), frontend.height());
+ QCOMPARE(backend.depth(), frontend.depth());
+ QCOMPARE(backend.layers(), frontend.layers());
+}
+
+void tst_RenderTexture::checkPropertyMirroring()
+{
+ checkPropertyMirroring<Qt3DRender::QTexture1D, Qt3DRender::QAbstractTexture::Target1D>();
+ checkPropertyMirroring<Qt3DRender::QTexture1DArray, Qt3DRender::QAbstractTexture::Target1DArray>();
+ checkPropertyMirroring<Qt3DRender::QTexture2D, Qt3DRender::QAbstractTexture::Target2D>();
+ checkPropertyMirroring<Qt3DRender::QTexture2DArray, Qt3DRender::QAbstractTexture::Target2DArray>();
+ checkPropertyMirroring<Qt3DRender::QTexture3D, Qt3DRender::QAbstractTexture::Target3D>();
+ checkPropertyMirroring<Qt3DRender::QTextureCubeMap, Qt3DRender::QAbstractTexture::TargetCubeMap>();
+ checkPropertyMirroring<Qt3DRender::QTextureCubeMapArray, Qt3DRender::QAbstractTexture::TargetCubeMapArray>();
+ checkPropertyMirroring<Qt3DRender::QTexture2DMultisample, Qt3DRender::QAbstractTexture::Target2DMultisample>();
+ checkPropertyMirroring<Qt3DRender::QTexture2DMultisampleArray, Qt3DRender::QAbstractTexture::Target2DMultisampleArray>();
+ checkPropertyMirroring<Qt3DRender::QTextureRectangle, Qt3DRender::QAbstractTexture::TargetRectangle>();
+ checkPropertyMirroring<Qt3DRender::QTextureBuffer, Qt3DRender::QAbstractTexture::TargetBuffer>();
+}
+
+void tst_RenderTexture::checkPropertyChanges()
+{
+ // GIVEN
+ TestRenderer renderer;
+ Qt3DRender::Render::Texture backend;
+ backend.setRenderer(&renderer);
+
+ // WHEN
+ Qt3DCore::QPropertyUpdatedChangePtr updateChange(new Qt3DCore::QPropertyUpdatedChange(Qt3DCore::QNodeId()));
+ updateChange->setValue(256);
+ updateChange->setPropertyName("width");
+ backend.sceneChangeEvent(updateChange);
+
+ // THEN
+ QCOMPARE(backend.width(), 256);
+
+ // WHEN
+ updateChange.reset(new Qt3DCore::QPropertyUpdatedChange(Qt3DCore::QNodeId()));
+ updateChange->setValue(128);
+ updateChange->setPropertyName("height");
+ backend.sceneChangeEvent(updateChange);
+
+ // THEN
+ QCOMPARE(backend.height(), 128);
+
+ // WHEN
+ updateChange.reset(new Qt3DCore::QPropertyUpdatedChange(Qt3DCore::QNodeId()));
+ updateChange->setValue(16);
+ updateChange->setPropertyName("depth");
+ backend.sceneChangeEvent(updateChange);
+
+ // THEN
+ QCOMPARE(backend.depth(), 16);
+
+ // WHEN
+ updateChange.reset(new Qt3DCore::QPropertyUpdatedChange(Qt3DCore::QNodeId()));
+ updateChange->setValue(32);
+ updateChange->setPropertyName("layers");
+ backend.sceneChangeEvent(updateChange);
+
+ // THEN
+ QCOMPARE(backend.layers(), 32);
+}
+
+QTEST_APPLESS_MAIN(tst_RenderTexture)
+
+#include "tst_texture.moc"
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 23:54:17 +0000