9 files changed, 223 insertions, 0 deletions
diff --git a/tests/manual/rhi/noninstanced/CMakeLists.txt b/tests/manual/rhi/noninstanced/CMakeLists.txt
new file mode 100644
index 0000000000..b1f88282ba
--- /dev/null
+++ b/tests/manual/rhi/noninstanced/CMakeLists.txt
@@ -0,0 +1,28 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+#####################################################################
+## noninstanced Binary:
+#####################################################################
+
+qt_internal_add_manual_test(noninstanced
+    GUI
+    SOURCES
+        noninstanced.cpp
+    LIBRARIES
+        Qt::Gui
+        Qt::GuiPrivate
+)
+
+# Resources:
+set(noninstanced_resource_files
+    "material.frag.qsb"
+    "material.vert.qsb"
+)
+
+qt_internal_add_resource(noninstanced "noninstanced"
+    PREFIX
+        "/"
+    FILES
+        ${noninstanced_resource_files}
+)
diff --git a/tests/manual/rhi/noninstanced/buildshaders.bat b/tests/manual/rhi/noninstanced/buildshaders.bat
new file mode 100644
index 0000000000..c1e0fb4722
--- /dev/null
+++ b/tests/manual/rhi/noninstanced/buildshaders.bat
@@ -0,0 +1,4 @@
+:: Copyright (C) 2024 The Qt Company Ltd.
+:: SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+qsb --glsl "100 es,120,150" --hlsl 50 --msl 12 material.vert -o material.vert.qsb
+qsb --glsl "100 es,120,150" --hlsl 50 --msl 12 material.frag -o material.frag.qsb
diff --git a/tests/manual/rhi/noninstanced/material.frag b/tests/manual/rhi/noninstanced/material.frag
new file mode 100644
index 0000000000..719fd79ff5
--- /dev/null
+++ b/tests/manual/rhi/noninstanced/material.frag
@@ -0,0 +1,9 @@
+#version 440
+
+layout(location = 0) in vec3 vColor;
+layout(location = 0) out vec4 fragColor;
+
+void main()
+{
+    fragColor = vec4(vColor, 1.0);
+}
diff --git a/tests/manual/rhi/noninstanced/material.frag.qsb b/tests/manual/rhi/noninstanced/material.frag.qsb
new file mode 100644
index 0000000000..5c65ea5709
--- /dev/null
+++ b/tests/manual/rhi/noninstanced/material.frag.qsb
diff --git a/tests/manual/rhi/noninstanced/material.vert b/tests/manual/rhi/noninstanced/material.vert
new file mode 100644
index 0000000000..8ed1dadfbe
--- /dev/null
+++ b/tests/manual/rhi/noninstanced/material.vert
@@ -0,0 +1,23 @@
+#version 440
+
+layout(location = 0) in vec4 position;
+
+layout(location = 0) out vec3 vColor;
+
+out gl_PerVertex { vec4 gl_Position; };
+
+layout(std140, binding = 0) uniform buf {
+    mat4 mvp;
+    vec3 translation;
+    vec3 color;
+} ubuf;
+
+void main()
+{
+    vColor = ubuf.color;
+    mat4 t = mat4(1, 0, 0, 0,
+                  0, 1, 0, 0,
+                  0, 0, 1, 0,
+                  ubuf.translation.x, ubuf.translation.y, ubuf.translation.z, 1);
+    gl_Position = ubuf.mvp * t * position;
+}
diff --git a/tests/manual/rhi/noninstanced/material.vert.qsb b/tests/manual/rhi/noninstanced/material.vert.qsb
new file mode 100644
index 0000000000..63322aea79
--- /dev/null
+++ b/tests/manual/rhi/noninstanced/material.vert.qsb
diff --git a/tests/manual/rhi/noninstanced/noninstanced.cpp b/tests/manual/rhi/noninstanced/noninstanced.cpp
new file mode 100644
index 0000000000..830dd4c84b
--- /dev/null
+++ b/tests/manual/rhi/noninstanced/noninstanced.cpp
@@ -0,0 +1,145 @@
+// Copyright (C) 2019 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
+
+#define EXAMPLEFW_PREINIT
+#include "../shared/examplefw.h"
+#include "../shared/cube.h"
+#include <QRandomGenerator>
+
+// A variation on the instancing test. No instancing here, just
+// individual uniform buffer updates and draw calls.
+
+const int INSTANCE_COUNT = 25000;
+
+struct {
+    QList<QRhiResource *> releasePool;
+
+    QRhiBuffer *vbuf;
+    QRhiBuffer *ubuf[INSTANCE_COUNT];
+    QRhiShaderResourceBindings *srb[INSTANCE_COUNT];
+    QRhiGraphicsPipeline *ps;
+
+    QRhiResourceUpdateBatch *initialUpdates = nullptr;
+
+    struct {
+        float x, y, z;
+        float r, g, b;
+    } instData[INSTANCE_COUNT];
+    float rot = 0.0f;
+} d;
+
+void preInit()
+{
+    debugLayer = false;
+}
+
+void Window::customInit()
+{
+    d.initialUpdates = m_r->nextResourceUpdateBatch();
+
+    d.vbuf = m_r->newBuffer(QRhiBuffer::Immutable, QRhiBuffer::VertexBuffer, sizeof(cube));
+    d.vbuf->create();
+    d.releasePool << d.vbuf;
+
+    d.initialUpdates->uploadStaticBuffer(d.vbuf, cube);
+
+    for (int i = 0; i < INSTANCE_COUNT; ++i) {
+        d.ubuf[i] = m_r->newBuffer(QRhiBuffer::Dynamic, QRhiBuffer::UniformBuffer, 92);
+        d.ubuf[i]->create();
+        d.releasePool << d.ubuf[i];
+
+        d.srb[i] = m_r->newShaderResourceBindings();
+        d.releasePool << d.srb[i];
+        d.srb[i]->setBindings({
+                QRhiShaderResourceBinding::uniformBuffer(0, QRhiShaderResourceBinding::VertexStage, d.ubuf[i])
+            });
+        d.srb[i]->create();
+    }
+
+    d.ps = m_r->newGraphicsPipeline();
+    d.releasePool << d.ps;
+    d.ps->setShaderStages({
+        { QRhiShaderStage::Vertex, getShader(QLatin1String(":/material.vert.qsb")) },
+        { QRhiShaderStage::Fragment, getShader(QLatin1String(":/material.frag.qsb")) }
+    });
+    QRhiVertexInputLayout inputLayout;
+    inputLayout.setBindings({
+        { 3 * sizeof(float) },
+    });
+    inputLayout.setAttributes({
+        { 0, 0, QRhiVertexInputAttribute::Float3, 0 },
+    });
+    d.ps->setVertexInputLayout(inputLayout);
+    d.ps->setShaderResourceBindings(d.srb[0]);
+    d.ps->setRenderPassDescriptor(m_rp);
+    d.ps->create();
+
+    QRandomGenerator *rgen = QRandomGenerator::global();
+    for (int i = 0; i < INSTANCE_COUNT; ++i) {
+        d.instData[i].x = rgen->bounded(8000) / 100.0f - 40.0f;
+        d.instData[i].y = rgen->bounded(8000) / 100.0f - 40.0f;
+        d.instData[i].z = rgen->bounded(100) / -4.0f;
+        d.instData[i].r = i / float(INSTANCE_COUNT);
+        d.instData[i].g = 0.0f;
+        d.instData[i].b = 0.0f;
+    }
+}
+
+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 = nullptr;
+    if (d.initialUpdates) {
+        u = d.initialUpdates;
+        d.initialUpdates = nullptr;
+    }
+
+    for (int i = 0; i < INSTANCE_COUNT; ++i) {
+        char *p = d.ubuf[i]->beginFullDynamicBufferUpdateForCurrentFrame();
+        QMatrix4x4 mvp = m_proj;
+        mvp.rotate(d.rot, 0, 1, 0);
+        mvp.scale(0.05f);
+        memcpy(p, mvp.constData(), 64);
+
+        // float *v = reinterpret_cast<float *>(p + 64);
+        // v[0] = d.instData[i].x;
+        // v[1] = d.instData[i].y;
+        // v[2] = d.instData[i].z;
+        memcpy(p + 64, &d.instData[i].x, 4);
+        memcpy(p + 68, &d.instData[i].y, 4);
+        memcpy(p + 72, &d.instData[i].z, 4);
+
+        // v = reinterpret_cast<float *>(p + 80);
+        // v[0] = d.instData[i].r;
+        // v[1] = d.instData[i].g;
+        // v[2] = d.instData[i].b;
+        memcpy(p + 80, &d.instData[i].r, 4);
+        memcpy(p + 84, &d.instData[i].g, 4);
+        memcpy(p + 88, &d.instData[i].b, 4);
+
+        d.ubuf[i]->endFullDynamicBufferUpdateForCurrentFrame();
+    }
+
+    cb->beginPass(m_sc->currentFrameRenderTarget(), m_clearColor, { 1.0f, 0 }, u, QRhiCommandBuffer::DoNotTrackResourcesForCompute);
+    for (int i = 0; i < INSTANCE_COUNT; ++i) {
+        cb->setGraphicsPipeline(d.ps);
+        if (i == 0)
+            cb->setViewport({ 0, 0, float(outputSizeInPixels.width()), float(outputSizeInPixels.height()) });
+        cb->setShaderResources(d.srb[i]);
+        const QRhiCommandBuffer::VertexInput vbufBinding[] = {
+            { d.vbuf, 0 },
+        };
+        cb->setVertexInput(0, 1, vbufBinding);
+        cb->draw(36);
+    }
+    cb->endPass();
+
+    d.rot += 0.1f;
+}
diff --git a/tests/manual/rhi/noninstanced/noninstanced.pro b/tests/manual/rhi/noninstanced/noninstanced.pro
new file mode 100644
index 0000000000..b45c60e58c
--- /dev/null
+++ b/tests/manual/rhi/noninstanced/noninstanced.pro
@@ -0,0 +1,8 @@
+TEMPLATE = app
+
+QT += gui-private
+
+SOURCES = \
+    noninstanced.cpp
+
+RESOURCES = noninstanced.qrc
diff --git a/tests/manual/rhi/noninstanced/noninstanced.qrc b/tests/manual/rhi/noninstanced/noninstanced.qrc
new file mode 100644
index 0000000000..6a308d7f8f
--- /dev/null
+++ b/tests/manual/rhi/noninstanced/noninstanced.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+  <qresource>
+    <file>material.vert.qsb</file>
+    <file>material.frag.qsb</file>
+</qresource>
+</RCC>