rhi: Manage buffer data without QBA

Use a simple and straightforward container that only does what
we need here.

Change-Id: I1a81b53a58bc91d533e3d7df5471a1362046825d
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

1 files changed, 8 insertions, 8 deletions

diff --git a/src/gui/rhi/qrhivulkan.cpp b/src/gui/rhi/qrhivulkan.cpp
index 5146a2ccc3..c0162820b6 100644
--- a/src/gui/rhi/qrhivulkan.cpp
+++ b/src/gui/rhi/qrhivulkan.cpp
@@ -2929,11 +2929,11 @@ void QRhiVulkan::enqueueResourceUpdates(QVkCommandBuffer *cbD, QRhiResourceUpdat
             QVkBuffer *bufD = QRHI_RES(QVkBuffer, u.buf);
             Q_ASSERT(bufD->m_type == QRhiBuffer::Dynamic);
             for (int i = 0; i < QVK_FRAMES_IN_FLIGHT; ++i)
-                bufD->pendingDynamicUpdates[i].append({ u.offset, u.dataSize, u.data });
+                bufD->pendingDynamicUpdates[i].append({ u.offset, u.data });
         } else if (u.type == QRhiResourceUpdateBatchPrivate::BufferOp::StaticUpload) {
             QVkBuffer *bufD = QRHI_RES(QVkBuffer, u.buf);
             Q_ASSERT(bufD->m_type != QRhiBuffer::Dynamic);
-            Q_ASSERT(u.offset + u.dataSize <= bufD->m_size);
+            Q_ASSERT(u.offset + u.data.size() <= bufD->m_size);
 
             if (!bufD->stagingBuffers[currentFrameSlot]) {
                 VkBufferCreateInfo bufferInfo;
@@ -2967,9 +2967,9 @@ void QRhiVulkan::enqueueResourceUpdates(QVkCommandBuffer *cbD, QRhiResourceUpdat
                 qWarning("Failed to map buffer: %d", err);
                 continue;
             }
-            memcpy(static_cast<uchar *>(p) + u.offset, u.data.constData(), size_t(u.dataSize));
+            memcpy(static_cast<uchar *>(p) + u.offset, u.data.constData(), size_t(u.data.size()));
             vmaUnmapMemory(toVmaAllocator(allocator), a);
-            vmaFlushAllocation(toVmaAllocator(allocator), a, VkDeviceSize(u.offset), VkDeviceSize(u.dataSize));
+            vmaFlushAllocation(toVmaAllocator(allocator), a, VkDeviceSize(u.offset), VkDeviceSize(u.data.size()));
 
             trackedBufferBarrier(cbD, bufD, 0,
                                  VK_ACCESS_TRANSFER_WRITE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT);
@@ -2978,7 +2978,7 @@ void QRhiVulkan::enqueueResourceUpdates(QVkCommandBuffer *cbD, QRhiResourceUpdat
             memset(&copyInfo, 0, sizeof(copyInfo));
             copyInfo.srcOffset = VkDeviceSize(u.offset);
             copyInfo.dstOffset = VkDeviceSize(u.offset);
-            copyInfo.size = VkDeviceSize(u.dataSize);
+            copyInfo.size = VkDeviceSize(u.data.size());
 
             QVkCommandBuffer::Command cmd;
             cmd.cmd = QVkCommandBuffer::Command::CopyBuffer;
@@ -3429,11 +3429,11 @@ void QRhiVulkan::executeBufferHostWritesForSlot(QVkBuffer *bufD, int slot)
     int changeBegin = -1;
     int changeEnd = -1;
     for (const QVkBuffer::DynamicUpdate &u : qAsConst(bufD->pendingDynamicUpdates[slot])) {
-        memcpy(static_cast<char *>(p) + u.offset, u.data.constData(), size_t(u.size));
+        memcpy(static_cast<char *>(p) + u.offset, u.data.constData(), size_t(u.data.size()));
         if (changeBegin == -1 || u.offset < changeBegin)
             changeBegin = u.offset;
-        if (changeEnd == -1 || u.offset + u.size > changeEnd)
-            changeEnd = u.offset + u.size;
+        if (changeEnd == -1 || u.offset + u.data.size() > changeEnd)
+            changeEnd = u.offset + u.data.size();
     }
     vmaUnmapMemory(toVmaAllocator(allocator), a);
     if (changeBegin >= 0)