10 files changed, 280 insertions, 0 deletions
diff --git a/tests/manual/rhi/computebuffer/buffer.comp b/tests/manual/rhi/computebuffer/buffer.comp
new file mode 100644
index 0000000000..a0d0350e37
--- /dev/null
+++ b/tests/manual/rhi/computebuffer/buffer.comp
@@ -0,0 +1,41 @@
+#version 440
+
+layout (local_size_x = 256) in;
+
+struct Data
+{
+    vec2 pos;
+    float dir;
+};
+
+layout(std140, binding = 0) buffer StorageBuffer
+{
+    Data d[];
+} buf;
+
+layout(std140, binding = 1) uniform UniformBuffer
+{
+    float step;
+    uint count;
+} ubuf;
+
+void main()
+{
+    uint index = gl_GlobalInvocationID.x;
+    if (index < ubuf.count) {
+        vec2 p = buf.d[index].pos;
+        float dir = buf.d[index].dir;
+
+        p.x += dir * ubuf.step * 0.01;
+        if (p.x > 1.0) {
+            p.x = 1.0;
+            buf.d[index].dir *= -1.0;
+        }
+        if (p.x < -1.0) {
+            p.x = -1.0;
+            buf.d[index].dir *= -1.0;
+        }
+
+        buf.d[index].pos = p;
+    }
+}
diff --git a/tests/manual/rhi/computebuffer/buffer.comp.qsb b/tests/manual/rhi/computebuffer/buffer.comp.qsb
new file mode 100644
index 0000000000..b1a666f185
--- /dev/null
+++ b/tests/manual/rhi/computebuffer/buffer.comp.qsb
diff --git a/tests/manual/rhi/computebuffer/buildshaders.bat b/tests/manual/rhi/computebuffer/buildshaders.bat
new file mode 100755
index 0000000000..2768273b70
--- /dev/null
+++ b/tests/manual/rhi/computebuffer/buildshaders.bat
@@ -0,0 +1,3 @@
+qsb --glsl "310 es,430" --hlsl 50 --msl 12 buffer.comp -o buffer.comp.qsb
+qsb --glsl "310 es,430" --hlsl 50 --msl 12 main.vert -o main.vert.qsb
+qsb --glsl "310 es,430" --hlsl 50 --msl 12 main.frag -o main.frag.qsb
diff --git a/tests/manual/rhi/computebuffer/computebuffer.cpp b/tests/manual/rhi/computebuffer/computebuffer.cpp
new file mode 100644
index 0000000000..d6c576cf3b
--- /dev/null
+++ b/tests/manual/rhi/computebuffer/computebuffer.cpp
@@ -0,0 +1,202 @@
+/****************************************************************************
+**
+** 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$
+**
+****************************************************************************/
+
+#include "../shared/examplefw.h"
+#include <QRandomGenerator>
+
+// Compute shader example. Writes to a storage buffer from a compute shader,
+// then uses the same buffer as vertex buffer in the vertex stage. This would
+// be typical when implementing particles for example. Here we just simply move
+// the positions back and forth along the X axis.
+
+// Note that the example relies on gl_PointSize which is not supported
+// everywhere. So in some cases the points will be of size 1.
+
+struct {
+    QVector<QRhiResource *> releasePool;
+    QRhiBuffer *sbuf = nullptr;
+    QRhiBuffer *computeUniBuf = nullptr;
+    QRhiShaderResourceBindings *computeBindings = nullptr;
+    QRhiComputePipeline *computePipeline = nullptr;
+    QRhiShaderResourceBindings *graphicsBindings = nullptr;
+    QRhiGraphicsPipeline *graphicsPipeline = nullptr;
+    QRhiResourceUpdateBatch *initialUpdates = nullptr;
+    float step = 0.2f;
+} d;
+
+// these struct must match the std140 packing rules
+struct Data {
+    float pos[2];
+    float dir;
+    quint32 pad[1];
+};
+struct ComputeUBuf {
+    float step;
+    quint32 count;
+};
+
+const int DATA_COUNT = 256 * 128;
+
+const int COMPUTE_UBUF_SIZE = 8;
+
+void Window::customInit()
+{
+    if (!m_r->isFeatureSupported(QRhi::Compute))
+        qFatal("Compute is not supported");
+
+    // compute pass
+
+    d.sbuf = m_r->newBuffer(QRhiBuffer::Immutable,
+                            QRhiBuffer::StorageBuffer | QRhiBuffer::VertexBuffer,
+                            sizeof(Data) * DATA_COUNT);
+    d.sbuf->build();
+    d.releasePool << d.sbuf;
+
+    d.computeUniBuf = m_r->newBuffer(QRhiBuffer::Dynamic, QRhiBuffer::UniformBuffer, COMPUTE_UBUF_SIZE);
+    d.computeUniBuf->build();
+    d.releasePool << d.computeUniBuf;
+
+    d.initialUpdates = m_r->nextResourceUpdateBatch();
+
+    QByteArray data;
+    data.resize(sizeof(Data) * DATA_COUNT);
+    Data *p = reinterpret_cast<Data *>(data.data());
+    QRandomGenerator *rgen = QRandomGenerator::global();
+    for (int i = 0; i < DATA_COUNT; ++i) {
+        p->pos[0] = rgen->bounded(1000) / 500.0f - 1.0f;
+        p->pos[1] = rgen->bounded(1000) / 500.0f - 1.0f;
+        p->dir = rgen->bounded(2) ? 1 : -1;
+        ++p;
+    }
+    d.initialUpdates->uploadStaticBuffer(d.sbuf, data.constData());
+
+    ComputeUBuf ud;
+    ud.step = d.step;
+    ud.count = DATA_COUNT;
+    d.initialUpdates->updateDynamicBuffer(d.computeUniBuf, 0, COMPUTE_UBUF_SIZE, &ud);
+
+    d.computeBindings = m_r->newShaderResourceBindings();
+    d.computeBindings->setBindings({
+                                       QRhiShaderResourceBinding::bufferLoadStore(0, QRhiShaderResourceBinding::ComputeStage, d.sbuf),
+                                       QRhiShaderResourceBinding::uniformBuffer(1, QRhiShaderResourceBinding::ComputeStage, d.computeUniBuf)
+                                   });
+    d.computeBindings->build();
+    d.releasePool << d.computeBindings;
+
+    d.computePipeline = m_r->newComputePipeline();
+    d.computePipeline->setShaderResourceBindings(d.computeBindings);
+    d.computePipeline->setShaderStage({ QRhiShaderStage::Compute, getShader(QLatin1String(":/buffer.comp.qsb")) });
+    d.computePipeline->build();
+    d.releasePool << d.computePipeline;
+
+    // graphics pass
+
+    d.graphicsBindings = m_r->newShaderResourceBindings();
+    d.graphicsBindings->build();
+    d.releasePool << d.graphicsBindings;
+
+    d.graphicsPipeline = m_r->newGraphicsPipeline();
+    d.graphicsPipeline->setTopology(QRhiGraphicsPipeline::Points);
+    d.graphicsPipeline->setShaderStages({
+        { QRhiShaderStage::Vertex, getShader(QLatin1String(":/main.vert.qsb")) },
+        { QRhiShaderStage::Fragment, getShader(QLatin1String(":/main.frag.qsb")) }
+    });
+    QRhiVertexInputLayout inputLayout;
+    inputLayout.setBindings({
+        { 2 * sizeof(float) }
+    });
+    inputLayout.setAttributes({
+        { 0, 0, QRhiVertexInputAttribute::Float2, 0 },
+    });
+    d.graphicsPipeline->setVertexInputLayout(inputLayout);
+    d.graphicsPipeline->setShaderResourceBindings(d.graphicsBindings);
+    d.graphicsPipeline->setRenderPassDescriptor(m_rp);
+    d.graphicsPipeline->build();
+    d.releasePool << d.graphicsPipeline;
+}
+
+void Window::customRelease()
+{
+    qDeleteAll(d.releasePool);
+    d.releasePool.clear();
+}
+
+void Window::customRender()
+{
+    const QSize outputSizeInPixels = m_sc->currentPixelSize();
+    QRhiCommandBuffer *cb = m_sc->currentFrameCommandBuffer();
+    QRhiResourceUpdateBatch *u = m_r->nextResourceUpdateBatch();
+    if (d.initialUpdates) {
+        u->merge(d.initialUpdates);
+        d.initialUpdates->release();
+        d.initialUpdates = nullptr;
+    }
+
+#if 0
+    u->updateDynamicBuffer(d.computeUniBuf, 0, sizeof(float), &d.step);
+    d.step += 0.01f;
+#endif
+
+    // compute pass
+    cb->beginComputePass(u);
+    cb->setComputePipeline(d.computePipeline);
+    cb->setShaderResources();
+    cb->dispatch(DATA_COUNT / 256, 1, 1);
+    cb->endComputePass();
+
+    // graphics pass
+    cb->beginPass(m_sc->currentFrameRenderTarget(), QColor::fromRgbF(0.4f, 0.7f, 0.0f, 1.0f), { 1.0f, 0 });
+    cb->setGraphicsPipeline(d.graphicsPipeline);
+    cb->setViewport({ 0, 0, float(outputSizeInPixels.width()), float(outputSizeInPixels.height()) });
+    QRhiCommandBuffer::VertexInput vbufBinding(d.sbuf, 0);
+    cb->setVertexInput(0, 1, &vbufBinding);
+    cb->draw(DATA_COUNT);
+    cb->endPass();
+}
diff --git a/tests/manual/rhi/computebuffer/computebuffer.pro b/tests/manual/rhi/computebuffer/computebuffer.pro
new file mode 100644
index 0000000000..ab3c8001f1
--- /dev/null
+++ b/tests/manual/rhi/computebuffer/computebuffer.pro
@@ -0,0 +1,8 @@
+TEMPLATE = app
+
+QT += gui-private
+
+SOURCES = \
+    computebuffer.cpp
+
+RESOURCES = computebuffer.qrc
diff --git a/tests/manual/rhi/computebuffer/computebuffer.qrc b/tests/manual/rhi/computebuffer/computebuffer.qrc
new file mode 100644
index 0000000000..d9e877a15d
--- /dev/null
+++ b/tests/manual/rhi/computebuffer/computebuffer.qrc
@@ -0,0 +1,7 @@
+<!DOCTYPE RCC><RCC version="1.0">
+  <qresource>
+    <file>buffer.comp.qsb</file>
+    <file>main.vert.qsb</file>
+    <file>main.frag.qsb</file>
+</qresource>
+</RCC>
diff --git a/tests/manual/rhi/computebuffer/main.frag b/tests/manual/rhi/computebuffer/main.frag
new file mode 100644
index 0000000000..4785a404d3
--- /dev/null
+++ b/tests/manual/rhi/computebuffer/main.frag
@@ -0,0 +1,8 @@
+#version 440
+
+layout(location = 0) out vec4 fragColor;
+
+void main()
+{
+    fragColor = vec4(1.0);
+}
diff --git a/tests/manual/rhi/computebuffer/main.frag.qsb b/tests/manual/rhi/computebuffer/main.frag.qsb
new file mode 100644
index 0000000000..f05da411e5
--- /dev/null
+++ b/tests/manual/rhi/computebuffer/main.frag.qsb
diff --git a/tests/manual/rhi/computebuffer/main.vert b/tests/manual/rhi/computebuffer/main.vert
new file mode 100644
index 0000000000..5dfb778d2e
--- /dev/null
+++ b/tests/manual/rhi/computebuffer/main.vert
@@ -0,0 +1,11 @@
+#version 440
+
+layout(location = 0) in vec4 position;
+
+out gl_PerVertex { vec4 gl_Position; float gl_PointSize; };
+
+void main()
+{
+    gl_PointSize = 4.0; // required with Vulkan when drawing points
+    gl_Position = position;
+}
diff --git a/tests/manual/rhi/computebuffer/main.vert.qsb b/tests/manual/rhi/computebuffer/main.vert.qsb
new file mode 100644
index 0000000000..944645ffbf
--- /dev/null
+++ b/tests/manual/rhi/computebuffer/main.vert.qsb