Refactor TransferQueue to require explicit finalization of transfers

[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 a80e1f945e280ebcfbc422bd62eea127528aa2d3..7edee3b2afa7ced6a67bd3e39f8e7dd67b724c64 100644 (file)
--- a/source/backends/vulkan/texture2d_backend.cpp
+++ b/source/backends/vulkan/texture2d_backend.cpp
@@ -1,3 +1,5 @@
+#include "device.h"
+#include "texture2d.h"
 #include "texture2d_backend.h"
 #include "vulkan.h"
 
@@ -10,9 +12,57 @@ VulkanTexture2D::VulkanTexture2D():
        Texture(VK_IMAGE_VIEW_TYPE_2D)
 { }
 
-void VulkanTexture2D::sub_image(unsigned, int, int, unsigned, unsigned, const void *)
+void VulkanTexture2D::fill_image_info(void *ii) const
 {
-       throw logic_error("Texture2D::sub_image is unimplemented");
+       const Texture2D &self = *static_cast<const Texture2D *>(this);
+
+       VkImageCreateInfo *image_info = static_cast<VkImageCreateInfo *>(ii);
+       image_info->imageType = VK_IMAGE_TYPE_2D;
+       image_info->extent.width = self.width;
+       image_info->extent.height = self.height;
+}
+
+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);
+}
+
+void VulkanTexture2D::fill_mipmap_blit(unsigned level, void *b)
+{
+       const Texture2D &self = *static_cast<const Texture2D *>(this);
+       VkImageBlit &blit = *static_cast<VkImageBlit *>(b);
+
+       auto src_size = self.get_level_size(level);
+       auto dst_size = self.get_level_size(level+1);
+
+       blit.srcOffsets[1] = { static_cast<int>(src_size.x), static_cast<int>(src_size.y), 1 };
+       blit.dstOffsets[1] = { static_cast<int>(dst_size.x), static_cast<int>(dst_size.y), 1 };
 }
 
 Resource::AsyncLoader *VulkanTexture2D::load(IO::Seekable &, const Resources *)