From 8cd4c288b5ab291a5415c6ecb0347f15e2adb5b2 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Tue, 24 May 2016 17:26:51 +0200 Subject: D3D12 manual test: add an async, uncached image loading test Change-Id: I8901a67d9e2b3343ba3f57775f1849400f6cdf18 Reviewed-by: Andy Nichols --- tests/manual/nodetypes/LotsOfImages.qml | 73 +++++++++++++++++++++++++++++++++ tests/manual/nodetypes/main.qml | 2 + tests/manual/nodetypes/nodetypes.cpp | 3 +- tests/manual/nodetypes/nodetypes.pro | 2 +- tests/manual/nodetypes/nodetypes.qrc | 1 + 5 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 tests/manual/nodetypes/LotsOfImages.qml diff --git a/tests/manual/nodetypes/LotsOfImages.qml b/tests/manual/nodetypes/LotsOfImages.qml new file mode 100644 index 0000000000..38356a3390 --- /dev/null +++ b/tests/manual/nodetypes/LotsOfImages.qml @@ -0,0 +1,73 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the demonstration applications of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.3 + +Item { + Grid { + columns: 20 + spacing: 4 + anchors.centerIn: parent + + Repeater { + model: 500 + + Image { + source: "qrc:/qt.png" + + // async true, cache false -> there is a separate, new texture for each and every image + // and the pixel data reading is done over and over again on a separate thread. + asynchronous: true + cache: false + + width: 20 + height: 20 + } + } + } + + Rectangle { + width: 100 + height: 100 + anchors.centerIn: parent + color: "red" + NumberAnimation on rotation { from: 0; to: 360; duration: 2000; loops: Animation.Infinite; } + } +} diff --git a/tests/manual/nodetypes/main.qml b/tests/manual/nodetypes/main.qml index 2ec2d37f14..a9fe09972c 100644 --- a/tests/manual/nodetypes/main.qml +++ b/tests/manual/nodetypes/main.qml @@ -59,6 +59,8 @@ Item { if (event.key === Qt.Key_I) loader.source = "qrc:/Images.qml"; + if (event.key === Qt.Key_5) + loader.source = "qrc:/LotsOfImages.qml"; if (event.key === Qt.Key_T) loader.source = "qrc:/Text.qml"; diff --git a/tests/manual/nodetypes/nodetypes.cpp b/tests/manual/nodetypes/nodetypes.cpp index 8dc282894f..c5382bab4a 100644 --- a/tests/manual/nodetypes/nodetypes.cpp +++ b/tests/manual/nodetypes/nodetypes.cpp @@ -174,8 +174,9 @@ int main(int argc, char **argv) qDebug("Available tests:"); qDebug(" [R] - Rectangles"); - qDebug(" [4] - A lot of rectangles (perf)"); + qDebug(" [4] - A lot of rectangles"); qDebug(" [I] - Images"); + qDebug(" [5] - A lot of async images"); qDebug(" [T] - Text"); qDebug(" [A] - Render thread Animator"); qDebug(" [L] - Layers"); diff --git a/tests/manual/nodetypes/nodetypes.pro b/tests/manual/nodetypes/nodetypes.pro index afb5a46a84..959b43cf18 100644 --- a/tests/manual/nodetypes/nodetypes.pro +++ b/tests/manual/nodetypes/nodetypes.pro @@ -5,5 +5,5 @@ SOURCES += nodetypes.cpp RESOURCES += nodetypes.qrc OTHER_FILES += main.qml Rects.qml LotsOfRects.qml \ - Images.qml Text.qml Animators.qml Layers.qml Effects.qml Painter.qml \ + Images.qml LotsOfImages.qml Text.qml Animators.qml Layers.qml Effects.qml Painter.qml \ wobble.hlsl shadow1.hlsl shadow2.hlsl diff --git a/tests/manual/nodetypes/nodetypes.qrc b/tests/manual/nodetypes/nodetypes.qrc index 56fa2b6ee4..78c0d085a1 100644 --- a/tests/manual/nodetypes/nodetypes.qrc +++ b/tests/manual/nodetypes/nodetypes.qrc @@ -4,6 +4,7 @@ Rects.qml LotsOfRects.qml Images.qml + LotsOfImages.qml Text.qml Animators.qml Layers.qml -- cgit v1.2.3