[Vulkan] Fix GraphicsDevice.UpdateBuffer with an offset.

veldrid · Mar 20, 2018 · 1018318 · 1018318
1 parent e3b50f1
commit 1018318
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/Veldrid/Vk/VkGraphicsDevice.cs b/src/Veldrid/Vk/VkGraphicsDevice.cs
@@ -851,26 +851,32 @@ protected override void UpdateBufferCore(DeviceBuffer buffer, uint bufferOffsetI
             VkBuffer vkBuffer = Util.AssertSubtype<DeviceBuffer, VkBuffer>(buffer);
             VkBuffer copySrcVkBuffer = null;
             IntPtr mappedPtr;
+            byte* destPtr;
             bool isPersistentMapped = vkBuffer.Memory.IsPersistentMapped;
             if (isPersistentMapped)
             {
                 mappedPtr = (IntPtr)vkBuffer.Memory.BlockMappedPointer;
+                destPtr = (byte*)mappedPtr + bufferOffsetInBytes;
             }
             else
             {
                 copySrcVkBuffer = GetFreeStagingBuffer(sizeInBytes);
                 mappedPtr = (IntPtr)copySrcVkBuffer.Memory.BlockMappedPointer;
+                destPtr = (byte*)mappedPtr;
             }
 
-            byte* destPtr = (byte*)mappedPtr + bufferOffsetInBytes;
             Unsafe.CopyBlock(destPtr, source.ToPointer(), sizeInBytes);
 
             if (!isPersistentMapped)
             {
                 SharedCommandPool pool = GetFreeCommandPool();
                 VkCommandBuffer cb = pool.BeginNewCommandBuffer();
 
-                VkBufferCopy copyRegion = new VkBufferCopy { size = vkBuffer.BufferMemoryRequirements.size };
+                VkBufferCopy copyRegion = new VkBufferCopy
+                {
+                    dstOffset = bufferOffsetInBytes,
+                    size = sizeInBytes
+                };
                 vkCmdCopyBuffer(cb, copySrcVkBuffer.DeviceBuffer, vkBuffer.DeviceBuffer, 1, ref copyRegion);
 
                 pool.EndAndSubmit(cb);