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 518f4c2ea54d552e0d50113f8c75a7f813d6e51c..7edee3b2afa7ced6a67bd3e39f8e7dd67b724c64 100644 (file)
--- a/source/backends/vulkan/texture2d_backend.cpp
+++ b/source/backends/vulkan/texture2d_backend.cpp
@@ -20,7 +20,6 @@ void VulkanTexture2D::fill_image_info(void *ii) const
        image_info->imageType = VK_IMAGE_TYPE_2D;
        image_info->extent.width = self.width;
        image_info->extent.height = self.height;
-       image_info->mipLevels = self.levels;
 }
 
 void VulkanTexture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, const void *data)
@@ -30,18 +29,18 @@ void VulkanTexture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsig
        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 = device.get_transfer_queue().prepare_transfer(this, false, data_size,
+       void *staging = tq.prepare_transfer(this, false, data_size,
                [this, level, discard](){
-                       unsigned n_levels = static_cast<const Texture2D *>(this)->levels;
-                       change_layout(n_levels, level, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 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 = VK_IMAGE_ASPECT_COLOR_BIT;
+                       region.imageSubresource.aspectMask = get_vulkan_aspect(get_components(storage_fmt));
                        region.imageSubresource.mipLevel = level;
                        region.imageSubresource.baseArrayLayer = 0;
                        region.imageSubresource.layerCount = 1;
@@ -50,13 +49,8 @@ void VulkanTexture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsig
                        vk.CmdCopyBufferToImage(cmd_buf, staging_buf, handle, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &region);
                });
 
-       const char *src = static_cast<const char *>(data);
-       copy(src, src+data_size, static_cast<char *>(staging));
-}
-
-void VulkanTexture2D::generate_mipmap()
-{
-       generate_mipmap_levels(static_cast<const Texture2D *>(this)->levels);
+       stage_pixels(staging, data, wd*ht);
+       tq.finalize_transfer(staging);
 }
 
 void VulkanTexture2D::fill_mipmap_blit(unsigned level, void *b)