From 53599592e09edd215bfa1eaa7e6f3a9f3fc50ae6 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Fri, 22 Mar 2019 09:55:03 +0100 Subject: Introduce the Qt graphics abstraction as private QtGui helpers Comes with backends for Vulkan, Metal, Direct3D 11.1, and OpenGL (ES). All APIs are private for now. Shader conditioning (i.e. generating a QRhiShader in memory or on disk from some shader source code) is done via the tools and APIs provided by qt-labs/qtshadertools. The OpenGL support follows the cross-platform tradition of requiring ES 2.0 only, while optionally using some (ES) 3.x features. It can operate in core profile contexts as well. Task-number: QTBUG-70287 Change-Id: I246f2e36d562e404012c05db2aa72487108aa7cc Reviewed-by: Lars Knoll --- .../compressedtexture_bc1_subupload.cpp | 213 +++++++++++++++++++++ .../compressedtexture_bc1_subupload.pro | 8 + .../compressedtexture_bc1_subupload.qrc | 8 + 3 files changed, 229 insertions(+) create mode 100644 tests/manual/rhi/compressedtexture_bc1_subupload/compressedtexture_bc1_subupload.cpp create mode 100644 tests/manual/rhi/compressedtexture_bc1_subupload/compressedtexture_bc1_subupload.pro create mode 100644 tests/manual/rhi/compressedtexture_bc1_subupload/compressedtexture_bc1_subupload.qrc (limited to 'tests/manual/rhi/compressedtexture_bc1_subupload') diff --git a/tests/manual/rhi/compressedtexture_bc1_subupload/compressedtexture_bc1_subupload.cpp b/tests/manual/rhi/compressedtexture_bc1_subupload/compressedtexture_bc1_subupload.cpp new file mode 100644 index 0000000000..7ae5dd0d73 --- /dev/null +++ b/tests/manual/rhi/compressedtexture_bc1_subupload/compressedtexture_bc1_subupload.cpp @@ -0,0 +1,213 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +#include "../shared/examplefw.h" +#include "../shared/cube.h" +#include "../shared/dds_bc1.h" + +struct { + QRhiBuffer *vbuf = nullptr; + bool vbufReady = false; + QRhiBuffer *ubuf = nullptr; + QRhiTexture *tex = nullptr; + QRhiSampler *sampler = nullptr; + QRhiShaderResourceBindings *srb = nullptr; + QRhiGraphicsPipeline *ps = nullptr; + + float rotation = 0; + + QByteArrayList compressedData; + QByteArrayList compressedData2; +} d; + +void Window::customInit() +{ + if (!m_r->isTextureFormatSupported(QRhiTexture::BC1)) + qFatal("This backend does not support BC1"); + + d.vbuf = m_r->newBuffer(QRhiBuffer::Immutable, QRhiBuffer::VertexBuffer, sizeof(cube)); + d.vbuf->build(); + d.vbufReady = false; + + d.ubuf = m_r->newBuffer(QRhiBuffer::Dynamic, QRhiBuffer::UniformBuffer, 68); + d.ubuf->build(); + + QSize imageSize; + d.compressedData = loadBC1(QLatin1String(":/qt256_bc1_9mips.dds"), &imageSize); + Q_ASSERT(imageSize == QSize(256, 256)); + + d.tex = m_r->newTexture(QRhiTexture::BC1, imageSize); + d.tex->build(); + + d.compressedData2 = loadBC1(QLatin1String(":/bwqt224_64_nomips.dds"), &imageSize); + Q_ASSERT(imageSize == QSize(224, 64)); + + d.sampler = m_r->newSampler(QRhiSampler::Linear, QRhiSampler::Linear, QRhiSampler::None, // no mipmapping here + QRhiSampler::ClampToEdge, QRhiSampler::ClampToEdge); + d.sampler->build(); + + d.srb = m_r->newShaderResourceBindings(); + d.srb->setBindings({ + QRhiShaderResourceBinding::uniformBuffer(0, QRhiShaderResourceBinding::VertexStage | QRhiShaderResourceBinding::FragmentStage, d.ubuf), + QRhiShaderResourceBinding::sampledTexture(1, QRhiShaderResourceBinding::FragmentStage, d.tex, d.sampler) + }); + d.srb->build(); + + d.ps = m_r->newGraphicsPipeline(); + + d.ps->setDepthTest(true); + d.ps->setDepthWrite(true); + d.ps->setDepthOp(QRhiGraphicsPipeline::Less); + + d.ps->setCullMode(QRhiGraphicsPipeline::Back); + d.ps->setFrontFace(QRhiGraphicsPipeline::CCW); + + const QShader vs = getShader(QLatin1String(":/texture.vert.qsb")); + if (!vs.isValid()) + qFatal("Failed to load shader pack (vertex)"); + const QShader fs = getShader(QLatin1String(":/texture.frag.qsb")); + if (!fs.isValid()) + qFatal("Failed to load shader pack (fragment)"); + + d.ps->setShaderStages({ + { QRhiGraphicsShaderStage::Vertex, vs }, + { QRhiGraphicsShaderStage::Fragment, fs } + }); + + QRhiVertexInputLayout inputLayout; + inputLayout.setBindings({ + { 3 * sizeof(float) }, + { 2 * sizeof(float) } + }); + inputLayout.setAttributes({ + { 0, 0, QRhiVertexInputAttribute::Float3, 0 }, + { 1, 1, QRhiVertexInputAttribute::Float2, 0 } + }); + + d.ps->setVertexInputLayout(inputLayout); + d.ps->setShaderResourceBindings(d.srb); + d.ps->setRenderPassDescriptor(m_rp); + + d.ps->build(); +} + +void Window::customRelease() +{ + delete d.ps; + d.ps = nullptr; + + delete d.srb; + d.srb = nullptr; + + delete d.ubuf; + d.ubuf = nullptr; + + delete d.vbuf; + d.vbuf = nullptr; + + delete d.sampler; + d.sampler = nullptr; + + delete d.tex; + d.tex = nullptr; +} + +void Window::customRender() +{ + QRhiResourceUpdateBatch *u = m_r->nextResourceUpdateBatch(); + if (!d.vbufReady) { + d.vbufReady = true; + u->uploadStaticBuffer(d.vbuf, cube); + qint32 flip = 0; + u->updateDynamicBuffer(d.ubuf, 64, 4, &flip); + } + if (!d.compressedData.isEmpty()) { + { + QRhiTextureUploadDescription desc({ 0, 0, { d.compressedData[0].constData(), d.compressedData[0].size() } }); + u->uploadTexture(d.tex, desc); + d.compressedData.clear(); + } + + // now exercise uploading a smaller compressed image into the same texture + { + QRhiTextureSubresourceUploadDescription image(d.compressedData2[0].constData(), d.compressedData2[0].size()); + // positions and sizes must be multiples of 4 here (for BC1) + image.setDestinationTopLeft(QPoint(16, 32)); + // the image is smaller than the subresource size (224x64 vs + // 256x256) so the size must be specified manually + image.setSourceSize(QSize(224, 64)); + QRhiTextureUploadDescription desc({ 0, 0, image }); + u->uploadTexture(d.tex, desc); + d.compressedData2.clear(); + } + } + d.rotation += 1.0f; + QMatrix4x4 mvp = m_proj; + mvp.scale(0.5f); + mvp.rotate(d.rotation, 0, 1, 0); + u->updateDynamicBuffer(d.ubuf, 0, 64, mvp.constData()); + + QRhiCommandBuffer *cb = m_sc->currentFrameCommandBuffer(); + const QSize outputSizeInPixels = m_sc->currentPixelSize(); + + cb->beginPass(m_sc->currentFrameRenderTarget(), QColor::fromRgbF(0.4f, 0.7f, 0.0f, 1.0f), { 1.0f, 0 }, u); + + cb->setGraphicsPipeline(d.ps); + cb->setViewport({ 0, 0, float(outputSizeInPixels.width()), float(outputSizeInPixels.height()) }); + cb->setShaderResources(); + const QRhiCommandBuffer::VertexInput vbufBindings[] = { + { d.vbuf, 0 }, + { d.vbuf, 36 * 3 * sizeof(float) } + }; + cb->setVertexInput(0, 2, vbufBindings); + cb->draw(36); + + cb->endPass(); +} diff --git a/tests/manual/rhi/compressedtexture_bc1_subupload/compressedtexture_bc1_subupload.pro b/tests/manual/rhi/compressedtexture_bc1_subupload/compressedtexture_bc1_subupload.pro new file mode 100644 index 0000000000..a1184fc754 --- /dev/null +++ b/tests/manual/rhi/compressedtexture_bc1_subupload/compressedtexture_bc1_subupload.pro @@ -0,0 +1,8 @@ +TEMPLATE = app + +QT += gui-private + +SOURCES = \ + compressedtexture_bc1_subupload.cpp + +RESOURCES = compressedtexture_bc1_subupload.qrc diff --git a/tests/manual/rhi/compressedtexture_bc1_subupload/compressedtexture_bc1_subupload.qrc b/tests/manual/rhi/compressedtexture_bc1_subupload/compressedtexture_bc1_subupload.qrc new file mode 100644 index 0000000000..859a0a79f6 --- /dev/null +++ b/tests/manual/rhi/compressedtexture_bc1_subupload/compressedtexture_bc1_subupload.qrc @@ -0,0 +1,8 @@ + + + ../shared/qt256_bc1_9mips.dds + ../shared/bwqt224_64_nomips.dds + ../shared/texture.vert.qsb + ../shared/texture.frag.qsb + + -- cgit v1.2.3