Refactor TransferQueue to require explicit finalization of transfers

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

diff --git a/source/backends/vulkan/texturecube_backend.cpp b/source/backends/vulkan/texturecube_backend.cpp
index 6a4e598c0c103b0ece427cbcd34bc07faa330f09..a92247d56746ed22426cf90a2e26867b718e3b35 100644 (file)
--- a/source/backends/vulkan/texturecube_backend.cpp
+++ b/source/backends/vulkan/texturecube_backend.cpp
@@ -21,7 +21,6 @@ void VulkanTextureCube::fill_image_info(void *ii) const
        image_info->imageType = VK_IMAGE_TYPE_2D;
        image_info->extent.width = self.size;
        image_info->extent.height = self.size;
-       image_info->mipLevels = self.levels;
        image_info->arrayLayers = 6;
 }
 
@@ -32,11 +31,11 @@ void VulkanTextureCube::sub_image(unsigned face, unsigned level, int x, int y, u
        unsigned level_size = self.get_level_size(level);
        bool discard = (x==0 && y==0 && wd==level_size && ht==level_size);
 
+       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 TextureCube *>(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, face, level, x, y, wd, ht](VkCommandBuffer cmd_buf, VkBuffer staging_buf, size_t src_off){
                        const VulkanFunctions &vk = device.get_functions();
@@ -53,11 +52,7 @@ void VulkanTextureCube::sub_image(unsigned face, unsigned level, int x, int y, u
                });
 
        stage_pixels(staging, data, wd*ht);
-}
-
-void VulkanTextureCube::generate_mipmap()
-{
-       generate_mipmap_levels(static_cast<const TextureCube *>(this)->levels);
+       tq.finalize_transfer(staging);
 }
 
 void VulkanTextureCube::fill_mipmap_blit(unsigned level, void *b)