X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Ftexture3d_backend.cpp;h=d2180556bce4ae645eb491ea517fa533c6509fb0;hb=d01902f355b1ea9a038a7f96cab37e49c6b65419;hp=05ed51829d6bacb200fc5eef3a16cba36f5cf580;hpb=eddb5cfd959eaa202ee6f95cd2049349ec920829;p=libs%2Fgl.git

diff --git a/source/backends/vulkan/texture3d_backend.cpp b/source/backends/vulkan/texture3d_backend.cpp
index 05ed5182..d2180556 100644
--- a/source/backends/vulkan/texture3d_backend.cpp
+++ b/source/backends/vulkan/texture3d_backend.cpp
@@ -34,14 +34,13 @@ void VulkanTexture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd
 	auto level_size = self.get_level_size(level);
 	bool discard = (x==0 && y==0 && z==0 && wd==level_size.x && ht==level_size.y && dp==level_size.z);
 
+	TransferQueue &tq = device.get_transfer_queue();
 	size_t data_size = wd*ht*dp*get_pixel_size(storage_fmt);
-	void *staging = device.get_transfer_queue().prepare_transfer(this, false, data_size,
+	void *staging = tq.prepare_transfer(this, false, data_size,
 		[this, level, discard](){
 			change_layout(level, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, discard);
 		},
-		[this, level, x, y, z, wd, ht, dp](VkCommandBuffer cmd_buf, VkBuffer staging_buf, size_t src_off){
-			const VulkanFunctions &vk = device.get_functions();
-
+		[this, level, x, y, z, wd, ht, dp](const VulkanCommandRecorder &vkCmd, VkBuffer staging_buf, size_t src_off){
 			VkBufferImageCopy region = { };
 			region.bufferOffset = src_off;
 			region.imageSubresource.aspectMask = get_vulkan_aspect(get_components(storage_fmt));
@@ -50,10 +49,11 @@ void VulkanTexture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd
 			region.imageSubresource.layerCount = (is_array() ? dp : 1);
 			region.imageOffset = { x, y, (is_array() ? 0 : z) };
 			region.imageExtent = { wd, ht, (is_array() ? 1 : dp) };
-			vk.CmdCopyBufferToImage(cmd_buf, staging_buf, handle, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &region);
+			vkCmd.CopyBufferToImage(staging_buf, handle, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &region);
 		});
 
 	stage_pixels(staging, data, wd*ht*dp);
+	tq.finalize_transfer(staging);
 }
 
 void VulkanTexture3D::fill_mipmap_blit(unsigned level, void *b)