diff options
Diffstat (limited to 'tests/manual/rhi/instancing')
-rw-r--r-- | tests/manual/rhi/instancing/CMakeLists.txt | 13 | ||||
-rw-r--r-- | tests/manual/rhi/instancing/buildshaders.bat | 2 | ||||
-rw-r--r-- | tests/manual/rhi/instancing/inst.frag.qsb | bin | 735 -> 724 bytes | |||
-rw-r--r-- | tests/manual/rhi/instancing/inst.vert | 12 | ||||
-rw-r--r-- | tests/manual/rhi/instancing/inst.vert.qsb | bin | 1456 -> 1225 bytes | |||
-rw-r--r-- | tests/manual/rhi/instancing/instancing.cpp | 78 |
6 files changed, 29 insertions, 76 deletions
diff --git a/tests/manual/rhi/instancing/CMakeLists.txt b/tests/manual/rhi/instancing/CMakeLists.txt index 6cc41c7a73..4d16b28b68 100644 --- a/tests/manual/rhi/instancing/CMakeLists.txt +++ b/tests/manual/rhi/instancing/CMakeLists.txt @@ -1,14 +1,15 @@ -# Generated from instancing.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## instancing Binary: ##################################################################### -qt_add_manual_test(instancing +qt_internal_add_manual_test(tst_manual_instancing GUI SOURCES instancing.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui Qt::GuiPrivate ) @@ -19,13 +20,9 @@ set(instancing_resource_files "inst.vert.qsb" ) -qt_add_resource(instancing "instancing" +qt_internal_add_resource(tst_manual_instancing "instancing" PREFIX "/" FILES ${instancing_resource_files} ) - - -#### Keys ignored in scope 1:.:.:instancing.pro:<TRUE>: -# TEMPLATE = "app" diff --git a/tests/manual/rhi/instancing/buildshaders.bat b/tests/manual/rhi/instancing/buildshaders.bat index 9053a1c54a..af18c09602 100644 --- a/tests/manual/rhi/instancing/buildshaders.bat +++ b/tests/manual/rhi/instancing/buildshaders.bat @@ -1,2 +1,4 @@ +:: Copyright (C) 2024 The Qt Company Ltd. +:: SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 qsb --glsl "330,300 es" --hlsl 50 --msl 12 inst.vert -o inst.vert.qsb qsb --glsl "330,300 es" --hlsl 50 --msl 12 inst.frag -o inst.frag.qsb diff --git a/tests/manual/rhi/instancing/inst.frag.qsb b/tests/manual/rhi/instancing/inst.frag.qsb Binary files differindex cd6b948227..c2a738734f 100644 --- a/tests/manual/rhi/instancing/inst.frag.qsb +++ b/tests/manual/rhi/instancing/inst.frag.qsb diff --git a/tests/manual/rhi/instancing/inst.vert b/tests/manual/rhi/instancing/inst.vert index 3e1b117d58..c5a1e65e1b 100644 --- a/tests/manual/rhi/instancing/inst.vert +++ b/tests/manual/rhi/instancing/inst.vert @@ -2,9 +2,9 @@ layout(location = 0) in vec4 position; -// Instanced attributes to variate the translation and color of the cube -layout(location = 1) in vec3 instTranslate; -layout(location = 2) in vec3 instColor; +// Instanced attributes to variate the transform and color of the cube +layout(location = 1) in mat4 instMat; +layout(location = 5) in vec3 instColor; layout(location = 0) out vec3 vColor; @@ -17,9 +17,5 @@ layout(std140, binding = 0) uniform buf { void main() { vColor = instColor; - mat4 t = mat4(1, 0, 0, 0, - 0, 1, 0, 0, - 0, 0, 1, 0, - instTranslate.x, instTranslate.y, instTranslate.z, 1); - gl_Position = ubuf.mvp * t * position; + gl_Position = ubuf.mvp * instMat * position; } diff --git a/tests/manual/rhi/instancing/inst.vert.qsb b/tests/manual/rhi/instancing/inst.vert.qsb Binary files differindex 4b891636e7..d9420639f8 100644 --- a/tests/manual/rhi/instancing/inst.vert.qsb +++ b/tests/manual/rhi/instancing/inst.vert.qsb diff --git a/tests/manual/rhi/instancing/instancing.cpp b/tests/manual/rhi/instancing/instancing.cpp index 87a99b4581..320cc2d6c7 100644 --- a/tests/manual/rhi/instancing/instancing.cpp +++ b/tests/manual/rhi/instancing/instancing.cpp @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, 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$ -** -****************************************************************************/ +// Copyright (C) 2019 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "../shared/examplefw.h" #include "../shared/cube.h" @@ -83,8 +36,8 @@ void Window::customInit() d.initialUpdates->uploadStaticBuffer(d.vbuf, cube); - // translation + color (vec3 + vec3), interleaved, for each instance - d.instBuf = m_r->newBuffer(QRhiBuffer::Immutable, QRhiBuffer::VertexBuffer, INSTANCE_COUNT * 6 * sizeof(float)); + // transform + color (mat4 + vec3), interleaved, for each instance + d.instBuf = m_r->newBuffer(QRhiBuffer::Immutable, QRhiBuffer::VertexBuffer, INSTANCE_COUNT * 19 * sizeof(float)); d.instBuf->create(); d.releasePool << d.instBuf; @@ -108,12 +61,15 @@ void Window::customInit() QRhiVertexInputLayout inputLayout; inputLayout.setBindings({ { 3 * sizeof(float) }, // cube vertices - { 6 * sizeof(float), QRhiVertexInputBinding::PerInstance } // per-instance translation and color + { 19 * sizeof(float), QRhiVertexInputBinding::PerInstance }, // per-instance transform and color }); inputLayout.setAttributes({ - { 0, 0, QRhiVertexInputAttribute::Float3, 0 }, // position - { 1, 1, QRhiVertexInputAttribute::Float3, 0 }, // instTranslate - { 1, 2, QRhiVertexInputAttribute::Float3, 3 * sizeof(float) } // instColor + { 0, 0, QRhiVertexInputAttribute::Float3, 0 }, // position + { 1, 1, QRhiVertexInputAttribute::Float4, 0, 0 }, // instMat + { 1, 2, QRhiVertexInputAttribute::Float4, 4 * sizeof(float), 1 }, + { 1, 3, QRhiVertexInputAttribute::Float4, 8 * sizeof(float), 2 }, + { 1, 4, QRhiVertexInputAttribute::Float4, 12 * sizeof(float), 3 }, + { 1, 5, QRhiVertexInputAttribute::Float3, 16 * sizeof(float) }, // instColor }); d.ps->setVertexInputLayout(inputLayout); d.ps->setShaderResourceBindings(d.srb); @@ -121,14 +77,16 @@ void Window::customInit() d.ps->create(); QByteArray instData; - instData.resize(INSTANCE_COUNT * 6 * sizeof(float)); + instData.resize(INSTANCE_COUNT * 19 * sizeof(float)); float *p = reinterpret_cast<float *>(instData.data()); QRandomGenerator *rgen = QRandomGenerator::global(); for (int i = 0; i < INSTANCE_COUNT; ++i) { - // translation - *p++ = rgen->bounded(8000) / 100.0f - 40.0f; - *p++ = rgen->bounded(8000) / 100.0f - 40.0f; - *p++ = 0.0f; + QMatrix4x4 m; + m.translate(rgen->bounded(8000) / 100.0f - 40.0f, + rgen->bounded(8000) / 100.0f - 40.0f, + 0.0f); + memcpy(p, m.constData(), 16 * sizeof(float)); + p += 16; // color *p++ = i / float(INSTANCE_COUNT); *p++ = 0.0f; |