diff options
Diffstat (limited to 'tests/manual/rhi/msaarenderbuffer/msaarenderbuffer.cpp')
-rw-r--r-- | tests/manual/rhi/msaarenderbuffer/msaarenderbuffer.cpp | 83 |
1 files changed, 18 insertions, 65 deletions
diff --git a/tests/manual/rhi/msaarenderbuffer/msaarenderbuffer.cpp b/tests/manual/rhi/msaarenderbuffer/msaarenderbuffer.cpp index 27dabb2276..539a1b42e1 100644 --- a/tests/manual/rhi/msaarenderbuffer/msaarenderbuffer.cpp +++ b/tests/manual/rhi/msaarenderbuffer/msaarenderbuffer.cpp @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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) 2018 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "../shared/examplefw.h" @@ -74,7 +27,7 @@ static float triangleData[] = }; struct { - QVector<QRhiResource *> releasePool; + QList<QRhiResource *> releasePool; QRhiBuffer *vbuf = nullptr; QRhiBuffer *ibuf = nullptr; QRhiBuffer *ubuf = nullptr; @@ -97,25 +50,25 @@ struct { void Window::customInit() { d.vbuf = m_r->newBuffer(QRhiBuffer::Immutable, QRhiBuffer::VertexBuffer, sizeof(vertexData) + sizeof(triangleData)); - d.vbuf->build(); + d.vbuf->create(); d.releasePool << d.vbuf; d.ibuf = m_r->newBuffer(QRhiBuffer::Immutable, QRhiBuffer::IndexBuffer, sizeof(indexData)); - d.ibuf->build(); + d.ibuf->create(); d.releasePool << d.ibuf; d.ubuf = m_r->newBuffer(QRhiBuffer::Dynamic, QRhiBuffer::UniformBuffer, 68); - d.ubuf->build(); + d.ubuf->create(); d.releasePool << d.ubuf; d.rb = m_r->newRenderBuffer(QRhiRenderBuffer::Color, QSize(512, 512), 4); // 4x MSAA - d.rb->build(); + d.rb->create(); d.releasePool << d.rb; // the non-msaa texture that will be the destination in the resolve d.tex = m_r->newTexture(QRhiTexture::RGBA8, d.rb->pixelSize(), 1, QRhiTexture::RenderTarget); d.releasePool << d.tex; - d.tex->build(); + d.tex->create(); // rb is multisample, instead of writing out the msaa data into it, // resolve into d.tex at the end of each render pass @@ -129,18 +82,18 @@ void Window::customInit() d.rtRp = d.rt->newCompatibleRenderPassDescriptor(); d.releasePool << d.rtRp; d.rt->setRenderPassDescriptor(d.rtRp); - d.rt->build(); + d.rt->create(); d.triUbuf = m_r->newBuffer(QRhiBuffer::Dynamic, QRhiBuffer::UniformBuffer, 68); d.releasePool << d.triUbuf; - d.triUbuf->build(); + d.triUbuf->create(); d.triSrb = m_r->newShaderResourceBindings(); d.releasePool << d.triSrb; d.triSrb->setBindings({ QRhiShaderResourceBinding::uniformBuffer(0, QRhiShaderResourceBinding::VertexStage | QRhiShaderResourceBinding::FragmentStage, d.triUbuf) }); - d.triSrb->build(); + d.triSrb->create(); d.triPs = m_r->newGraphicsPipeline(); d.releasePool << d.triPs; @@ -155,17 +108,17 @@ void Window::customInit() }); inputLayout.setAttributes({ { 0, 0, QRhiVertexInputAttribute::Float2, 0 }, - { 0, 1, QRhiVertexInputAttribute::Float3, 2 * sizeof(float) } + { 0, 1, QRhiVertexInputAttribute::Float3, quint32(2 * sizeof(float)) } }); d.triPs->setVertexInputLayout(inputLayout); d.triPs->setShaderResourceBindings(d.triSrb); d.triPs->setRenderPassDescriptor(d.rtRp); - d.triPs->build(); + d.triPs->create(); d.sampler = m_r->newSampler(QRhiSampler::Linear, QRhiSampler::Linear, QRhiSampler::None, QRhiSampler::ClampToEdge, QRhiSampler::ClampToEdge); d.releasePool << d.sampler; - d.sampler->build(); + d.sampler->create(); d.srb = m_r->newShaderResourceBindings(); d.releasePool << d.srb; @@ -173,7 +126,7 @@ void Window::customInit() QRhiShaderResourceBinding::uniformBuffer(0, QRhiShaderResourceBinding::VertexStage | QRhiShaderResourceBinding::FragmentStage, d.ubuf), QRhiShaderResourceBinding::sampledTexture(1, QRhiShaderResourceBinding::FragmentStage, d.tex, d.sampler) }); - d.srb->build(); + d.srb->create(); d.ps = m_r->newGraphicsPipeline(); d.releasePool << d.ps; @@ -186,12 +139,12 @@ void Window::customInit() }); inputLayout.setAttributes({ { 0, 0, QRhiVertexInputAttribute::Float2, 0 }, - { 0, 1, QRhiVertexInputAttribute::Float2, 2 * sizeof(float) } + { 0, 1, QRhiVertexInputAttribute::Float2, quint32(2 * sizeof(float)) } }); d.ps->setVertexInputLayout(inputLayout); d.ps->setShaderResourceBindings(d.srb); d.ps->setRenderPassDescriptor(m_rp); - d.ps->build(); + d.ps->create(); d.initialUpdates = m_r->nextResourceUpdateBatch(); d.initialUpdates->uploadStaticBuffer(d.vbuf, 0, sizeof(vertexData), vertexData); @@ -241,7 +194,7 @@ void Window::customRender() cb->setGraphicsPipeline(d.triPs); cb->setViewport({ 0, 0, float(d.rb->pixelSize().width()), float(d.rb->pixelSize().height()) }); cb->setShaderResources(); - QRhiCommandBuffer::VertexInput vbufBinding(d.vbuf, sizeof(vertexData)); + QRhiCommandBuffer::VertexInput vbufBinding(d.vbuf, quint32(sizeof(vertexData))); cb->setVertexInput(0, 1, &vbufBinding); cb->draw(3); cb->endPass(); |