summaryrefslogtreecommitdiffstats
path: root/tests/manual
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2020-10-11 22:02:43 +0200
committerLaszlo Agocs <laszlo.agocs@qt.io>2020-10-12 07:55:37 +0200
commit2189e0f2fc2aadf84ed53a7ae6210e2bbe04b45e (patch)
tree5cdc23693256752f6b7ad624efa1d270fd7bd247 /tests/manual
parente7c456d3395826a427b863c0cfc8c60aa4ab7d6c (diff)
rhi: Make the new direct buffer update available for non-uniform buffers
The original restriction to UniformBuffer was due to the GL backend where there is no GL buffer object for QRhiBuffers with usage UniformBuffer. However, we can still implement this for cases when there is a true GL buffer object underneath. With other backends it should all work as-is already. This becomes useful when one has buffers with usage Vertex that need full updates every frame. (f.ex. instance data) Unfortunately this involves renaming the function. But while at it, add an autotest case as well. Change-Id: Iff59e4509a8bae06654cc92fe8428bd79eb012fb Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'tests/manual')
-rw-r--r--tests/manual/rhi/noninstanced/noninstanced.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/manual/rhi/noninstanced/noninstanced.cpp b/tests/manual/rhi/noninstanced/noninstanced.cpp
index 31ea6e24a2..e014e302e0 100644
--- a/tests/manual/rhi/noninstanced/noninstanced.cpp
+++ b/tests/manual/rhi/noninstanced/noninstanced.cpp
@@ -149,7 +149,7 @@ void Window::customRender()
}
for (int i = 0; i < INSTANCE_COUNT; ++i) {
- char *p = d.ubuf[i]->beginFullDynamicUniformBufferUpdateForCurrentFrame();
+ char *p = d.ubuf[i]->beginFullDynamicBufferUpdateForCurrentFrame();
QMatrix4x4 mvp = m_proj;
mvp.rotate(d.rot, 0, 1, 0);
mvp.scale(0.05f);
@@ -171,7 +171,7 @@ void Window::customRender()
memcpy(p + 84, &d.instData[i].g, 4);
memcpy(p + 88, &d.instData[i].b, 4);
- d.ubuf[i]->endFullDynamicUniformBufferUpdateForCurrentFrame();
+ d.ubuf[i]->endFullDynamicBufferUpdateForCurrentFrame();
}
cb->beginPass(m_sc->currentFrameRenderTarget(), m_clearColor, { 1.0f, 0 }, u, QRhiCommandBuffer::DoNotTrackResourcesForCompute);