diff options
Diffstat (limited to 'tests/manual/rhi/instancing/instancing.cpp')
| -rw-r--r-- | tests/manual/rhi/instancing/instancing.cpp | 78 |
1 files changed, 18 insertions, 60 deletions
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; |