10 files changed, 190 insertions, 0 deletions
diff --git a/tests/manual/rhi/geometryshader/CMakeLists.txt b/tests/manual/rhi/geometryshader/CMakeLists.txt
new file mode 100644
index 0000000000..2a23058786
--- /dev/null
+++ b/tests/manual/rhi/geometryshader/CMakeLists.txt
@@ -0,0 +1,24 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+qt_internal_add_manual_test(geometryshader
+    GUI
+    SOURCES
+        geometryshader.cpp
+    LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+set(geometryshader_resource_files
+    "test.vert.qsb"
+    "test.geom.qsb"
+    "test.frag.qsb"
+)
+
+qt_internal_add_resource(geometryshader "geometryshader"
+    PREFIX
+        "/"
+    FILES
+        ${geometryshader_resource_files}
+)
diff --git a/tests/manual/rhi/geometryshader/buildshaders.bat b/tests/manual/rhi/geometryshader/buildshaders.bat
new file mode 100755
index 0000000000..6da26a6a2a
--- /dev/null
+++ b/tests/manual/rhi/geometryshader/buildshaders.bat
@@ -0,0 +1,4 @@
+qsb --glsl 320es,410 --hlsl 50 test.vert -o test.vert.qsb
+qsb --glsl 320es,410 test.geom -o test.geom.qsb
+qsb -r hlsl,50,test_geom.hlsl test.geom.qsb
+qsb --glsl 320es,410 --hlsl 50 test.frag -o test.frag.qsb
diff --git a/tests/manual/rhi/geometryshader/geometryshader.cpp b/tests/manual/rhi/geometryshader/geometryshader.cpp
new file mode 100644
index 0000000000..e03f247e9f
--- /dev/null
+++ b/tests/manual/rhi/geometryshader/geometryshader.cpp
@@ -0,0 +1,94 @@
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+
+#include "../shared/examplefw.h"
+
+static const float points[] = { 0.0f, 0.0f, 0.0f };
+
+struct
+{
+    QVector<QRhiResource *> releasePool;
+    QRhiBuffer *vbuf = nullptr;
+    QRhiBuffer *ubuf = nullptr;
+    QRhiShaderResourceBindings *srb = nullptr;
+    QRhiGraphicsPipeline *ps = nullptr;
+    QRhiResourceUpdateBatch *initialUpdates = nullptr;
+    float radius = 0.0f;
+} d;
+
+void Window::customInit()
+{
+    if (!m_r->isFeatureSupported(QRhi::GeometryShader))
+        qFatal("Geometry shaders are not supported");
+
+    m_clearColor.setRgb(0, 0, 0);
+
+    d.vbuf = m_r->newBuffer(QRhiBuffer::Immutable, QRhiBuffer::VertexBuffer, sizeof(points));
+    d.vbuf->create();
+    d.releasePool << d.vbuf;
+
+    d.ubuf = m_r->newBuffer(QRhiBuffer::Dynamic, QRhiBuffer::UniformBuffer, 4);
+    d.ubuf->create();
+    d.releasePool << d.ubuf;
+
+    d.srb = m_r->newShaderResourceBindings();
+    d.releasePool << d.srb;
+    const QRhiShaderResourceBinding::StageFlags geom = QRhiShaderResourceBinding::GeometryStage;
+    d.srb->setBindings({ QRhiShaderResourceBinding::uniformBuffer(0, geom, d.ubuf) });
+    d.srb->create();
+
+    d.ps = m_r->newGraphicsPipeline();
+    d.releasePool << d.ps;
+
+    d.ps->setTopology(QRhiGraphicsPipeline::Points);
+
+    d.ps->setShaderStages(
+            { { QRhiShaderStage::Vertex, getShader(QLatin1String(":/test.vert.qsb")) },
+              { QRhiShaderStage::Geometry, getShader(QLatin1String(":/test.geom.qsb")) },
+              { QRhiShaderStage::Fragment, getShader(QLatin1String(":/test.frag.qsb")) } });
+
+    d.ps->setCullMode(QRhiGraphicsPipeline::Back);
+    d.ps->setDepthTest(true);
+    d.ps->setDepthWrite(true);
+    QRhiVertexInputLayout inputLayout;
+    inputLayout.setBindings({ { 3 * sizeof(float) } });
+    inputLayout.setAttributes({ { 0, 0, QRhiVertexInputAttribute::Float3, 0 } });
+    d.ps->setVertexInputLayout(inputLayout);
+    d.ps->setShaderResourceBindings(d.srb);
+    d.ps->setRenderPassDescriptor(m_rp);
+    d.ps->create();
+
+    d.initialUpdates = m_r->nextResourceUpdateBatch();
+    d.initialUpdates->uploadStaticBuffer(d.vbuf, points);
+    d.initialUpdates->updateDynamicBuffer(d.ubuf, 0, 4, &d.radius);
+}
+
+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;
+    }
+
+    u->updateDynamicBuffer(d.ubuf, 0, 4, &d.radius);
+    d.radius = std::fmod(d.radius + 0.01f, 1.0f);
+
+    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(1);
+    cb->endPass();
+}
diff --git a/tests/manual/rhi/geometryshader/test.frag b/tests/manual/rhi/geometryshader/test.frag
new file mode 100644
index 0000000000..4785a404d3
--- /dev/null
+++ b/tests/manual/rhi/geometryshader/test.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/geometryshader/test.frag.qsb b/tests/manual/rhi/geometryshader/test.frag.qsb
new file mode 100644
index 0000000000..b6a5877b95
--- /dev/null
+++ b/tests/manual/rhi/geometryshader/test.frag.qsb
diff --git a/tests/manual/rhi/geometryshader/test.geom b/tests/manual/rhi/geometryshader/test.geom
new file mode 100644
index 0000000000..750a3085bd
--- /dev/null
+++ b/tests/manual/rhi/geometryshader/test.geom
@@ -0,0 +1,26 @@
+#version 430
+
+# define M_PI 3.14159265358979323846
+
+layout(points) in;
+layout(line_strip, max_vertices = 7) out;
+
+layout(std140, binding = 0) uniform buf {
+    float radius;
+};
+
+void main(void)
+{
+
+    for(int i=0;i<7;++i)
+    {
+        float theta = float(i) / 6.0f * 2.0 * M_PI;
+
+        gl_Position = gl_in[0].gl_Position;
+        gl_Position.xy += radius * vec2(cos(theta), sin(theta));
+
+        EmitVertex();
+    }
+    EndPrimitive();
+
+}
diff --git a/tests/manual/rhi/geometryshader/test.geom.qsb b/tests/manual/rhi/geometryshader/test.geom.qsb
new file mode 100644
index 0000000000..9aa4a0cf98
--- /dev/null
+++ b/tests/manual/rhi/geometryshader/test.geom.qsb
diff --git a/tests/manual/rhi/geometryshader/test.vert b/tests/manual/rhi/geometryshader/test.vert
new file mode 100644
index 0000000000..af06581f6a
--- /dev/null
+++ b/tests/manual/rhi/geometryshader/test.vert
@@ -0,0 +1,8 @@
+#version 440
+
+layout(location = 0) in vec3 position;
+
+void main()
+{
+    gl_Position = vec4(position, 1.0);
+}
diff --git a/tests/manual/rhi/geometryshader/test.vert.qsb b/tests/manual/rhi/geometryshader/test.vert.qsb
new file mode 100644
index 0000000000..7238d8037b
--- /dev/null
+++ b/tests/manual/rhi/geometryshader/test.vert.qsb
diff --git a/tests/manual/rhi/geometryshader/test_geom.hlsl b/tests/manual/rhi/geometryshader/test_geom.hlsl
new file mode 100644
index 0000000000..e58659252b
--- /dev/null
+++ b/tests/manual/rhi/geometryshader/test_geom.hlsl
@@ -0,0 +1,26 @@
+struct VertexOutput
+{
+    float4 position : SV_Position;
+};
+
+struct PixelInput
+{
+    float4 position : SV_POSITION;
+};
+
+cbuffer buf : register(b0)
+{
+    float radius : packoffset(c0);
+};
+
+[maxvertexcount(7)]
+void main(point VertexOutput input[1], inout LineStream<PixelInput> OutputStream)
+{
+    PixelInput output;
+    for (int i = 0; i < 7; ++i) {
+        float theta = float(i) / 6.0f * 2.0 * 3.14159265;
+        output.position = input[0].position;
+        output.position.xy += radius * float2(cos(theta), sin(theta));
+        OutputStream.Append(output);
+    }
+}