Add an asynchronous version of Texture2D::sub_image

[libs/gl.git] / source / backends / vulkan / texture2d_backend.cpp

diff --git a/source/backends/vulkan/texture2d_backend.cpp b/source/backends/vulkan/texture2d_backend.cpp
index 7edee3b2afa7ced6a67bd3e39f8e7dd67b724c64..7c6b55f1ee94dfb0652ef76ea8adb7e75675fbbf 100644 (file)
--- a/source/backends/vulkan/texture2d_backend.cpp
+++ b/source/backends/vulkan/texture2d_backend.cpp
@@ -24,33 +24,8 @@ void VulkanTexture2D::fill_image_info(void *ii) const
 
 void VulkanTexture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, const void *data)
 {
-       const Texture2D &self = *static_cast<const Texture2D *>(this);
-
-       auto level_size = self.get_level_size(level);
-       bool discard = (x==0 && y==0 && wd==level_size.x && ht==level_size.y);
-
-       TransferQueue &tq = device.get_transfer_queue();
-       size_t data_size = wd*ht*get_pixel_size(storage_fmt);
-       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, wd, ht](VkCommandBuffer cmd_buf, VkBuffer staging_buf, size_t src_off){
-                       const VulkanFunctions &vk = device.get_functions();
-
-                       VkBufferImageCopy region = { };
-                       region.bufferOffset = src_off;
-                       region.imageSubresource.aspectMask = get_vulkan_aspect(get_components(storage_fmt));
-                       region.imageSubresource.mipLevel = level;
-                       region.imageSubresource.baseArrayLayer = 0;
-                       region.imageSubresource.layerCount = 1;
-                       region.imageOffset = { x, y, 0 };
-                       region.imageExtent = { wd, ht, 1 };
-                       vk.CmdCopyBufferToImage(cmd_buf, staging_buf, handle, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &region);
-               });
-
-       stage_pixels(staging, data, wd*ht);
-       tq.finalize_transfer(staging);
+       Texture2D::AsyncTransfer transfer(*static_cast<Texture2D *>(this), level, x, y, wd, ht);
+       stage_pixels(transfer.get_address(), data, wd*ht);
 }
 
 void VulkanTexture2D::fill_mipmap_blit(unsigned level, void *b)
@@ -79,5 +54,46 @@ void VulkanTexture2D::unload()
 {
 }
 
+
+void *VulkanTexture2D::AsyncTransfer::allocate()
+{
+       const Texture2D::AsyncTransfer &self = *static_cast<const Texture2D::AsyncTransfer *>(this);
+
+       Texture2D &tex = *self.texture;
+       unsigned level = self.level;
+       int x = self.x;
+       int y = self.y;
+       unsigned wd = self.width;
+       unsigned ht = self.height;
+
+       auto level_size = tex.get_level_size(level);
+       bool discard = (x==0 && y==0 && wd==level_size.x && ht==level_size.y);
+
+       TransferQueue &tq = tex.device.get_transfer_queue();
+       return tq.prepare_transfer(&tex, false, self.data_size,
+               [&tex, level, discard](){
+                       tex.change_layout(level, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, discard);
+               },
+               [&tex, level, x, y, wd, ht](VkCommandBuffer cmd_buf, VkBuffer staging_buf, size_t src_off){
+                       const VulkanFunctions &vk = tex.device.get_functions();
+
+                       VkBufferImageCopy region = { };
+                       region.bufferOffset = src_off;
+                       region.imageSubresource.aspectMask = get_vulkan_aspect(get_components(tex.storage_fmt));
+                       region.imageSubresource.mipLevel = level;
+                       region.imageSubresource.baseArrayLayer = 0;
+                       region.imageSubresource.layerCount = 1;
+                       region.imageOffset = { x, y, 0 };
+                       region.imageExtent = { wd, ht, 1 };
+                       vk.CmdCopyBufferToImage(cmd_buf, staging_buf, tex.handle, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &region);
+               });
+}
+
+void VulkanTexture2D::AsyncTransfer::finalize()
+{
+       const Texture2D::AsyncTransfer &self = *static_cast<const Texture2D::AsyncTransfer *>(this);
+       self.texture->device.get_transfer_queue().finalize_transfer(self.dest_addr);
+}
+
 } // namespace GL
 } // namespace Msp