diff options
Diffstat (limited to 'tests/manual/rhi/tessellation/tessellation.cpp')
-rw-r--r-- | tests/manual/rhi/tessellation/tessellation.cpp | 78 |
1 files changed, 26 insertions, 52 deletions
diff --git a/tests/manual/rhi/tessellation/tessellation.cpp b/tests/manual/rhi/tessellation/tessellation.cpp index e8a031a1cf..a50ddeeeb2 100644 --- a/tests/manual/rhi/tessellation/tessellation.cpp +++ b/tests/manual/rhi/tessellation/tessellation.cpp @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 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) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "../shared/examplefw.h" @@ -56,9 +9,13 @@ static const float tri[] = { 0.5f, -0.5f, 0.0f, 0.0f, 1.0f, 0.0f, }; +static const bool INDEXED = false; +static const quint32 indices[] = { 0, 1, 2 }; + struct { QVector<QRhiResource *> releasePool; QRhiBuffer *vbuf = nullptr; + QRhiBuffer *ibuf = nullptr; QRhiBuffer *ubuf = nullptr; QRhiShaderResourceBindings *srb = nullptr; QRhiGraphicsPipeline *ps = nullptr; @@ -76,6 +33,12 @@ void Window::customInit() d.vbuf->create(); d.releasePool << d.vbuf; + if (INDEXED) { + d.ibuf = m_r->newBuffer(QRhiBuffer::Immutable, QRhiBuffer::IndexBuffer, sizeof(indices)); + d.ibuf->create(); + d.releasePool << d.ibuf; + } + d.ubuf = m_r->newBuffer(QRhiBuffer::Dynamic, QRhiBuffer::UniformBuffer, 64 + 4 + 4); d.ubuf->create(); d.releasePool << d.ubuf; @@ -100,6 +63,7 @@ void Window::customInit() }); d.ps->setCullMode(QRhiGraphicsPipeline::Back); + d.ps->setPolygonMode(QRhiGraphicsPipeline::Line); d.ps->setDepthTest(true); d.ps->setDepthWrite(true); QRhiVertexInputLayout inputLayout; @@ -117,8 +81,12 @@ void Window::customInit() d.initialUpdates = m_r->nextResourceUpdateBatch(); d.initialUpdates->uploadStaticBuffer(d.vbuf, tri); + const float amplitude = 0.5f; d.initialUpdates->updateDynamicBuffer(d.ubuf, 68, 4, &litude); + + if (INDEXED) + d.initialUpdates->uploadStaticBuffer(d.ibuf, indices); } void Window::customRelease() @@ -142,14 +110,20 @@ void Window::customRender() u->updateDynamicBuffer(d.ubuf, 0, 64, d.winProj.constData()); } u->updateDynamicBuffer(d.ubuf, 64, 4, &d.time); - d.time += 0.1f; + d.time += 0.01f; cb->beginPass(m_sc->currentFrameRenderTarget(), m_clearColor, { 1.0f, 0 }, u); cb->setGraphicsPipeline(d.ps); cb->setViewport({ 0, 0, float(outputSizeInPixels.width()), float(outputSizeInPixels.height()) }); cb->setShaderResources(); QRhiCommandBuffer::VertexInput vbufBinding(d.vbuf, 0); - cb->setVertexInput(0, 1, &vbufBinding); - cb->draw(3); + if (INDEXED) { + cb->setVertexInput(0, 1, &vbufBinding, d.ibuf, 0, QRhiCommandBuffer::IndexUInt32); + cb->drawIndexed(3); + } else { + cb->setVertexInput(0, 1, &vbufBinding); + cb->draw(3); + } + cb->endPass(); } |