Refactor TransferQueue to require explicit finalization of transfers

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

diff --git a/source/backends/vulkan/texture1d_backend.cpp b/source/backends/vulkan/texture1d_backend.cpp
index d97576ce0990e0170c433c8356ad3df6ab1d3a69..539060da3f13b54d2dc3e4966ac4ac9fad9075a4 100644 (file)
--- a/source/backends/vulkan/texture1d_backend.cpp
+++ b/source/backends/vulkan/texture1d_backend.cpp
@@ -19,7 +19,6 @@ void VulkanTexture1D::fill_image_info(void *ii) const
        VkImageCreateInfo *image_info = static_cast<VkImageCreateInfo *>(ii);
        image_info->imageType = VK_IMAGE_TYPE_1D;
        image_info->extent.width = self.width;
-       image_info->mipLevels = self.levels;
 }
 
 void VulkanTexture1D::sub_image(unsigned level, int x, unsigned wd, const void *data)
@@ -29,18 +28,18 @@ void VulkanTexture1D::sub_image(unsigned level, int x, unsigned wd, const void *
        unsigned level_size = self.get_level_size(level);
        bool discard = (x==0 && wd==level_size);
 
+       TransferQueue &tq = device.get_transfer_queue();
        size_t data_size = wd*get_pixel_size(storage_fmt);
-       void *staging = device.get_transfer_queue().prepare_transfer(data_size,
+       void *staging = tq.prepare_transfer(this, false, data_size,
                [this, level, discard](){
-                       unsigned n_levels = static_cast<const Texture1D *>(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, wd](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;
@@ -49,8 +48,20 @@ void VulkanTexture1D::sub_image(unsigned level, int x, unsigned wd, const void *
                        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));
+       stage_pixels(staging, data, wd);
+       tq.finalize_transfer(staging);
+}
+
+void VulkanTexture1D::fill_mipmap_blit(unsigned level, void *b)
+{
+       const Texture1D &self = *static_cast<const Texture1D *>(this);
+       VkImageBlit &blit = *static_cast<VkImageBlit *>(b);
+
+       int src_size = self.get_level_size(level);
+       int dst_size = self.get_level_size(level+1);
+
+       blit.srcOffsets[1] = { src_size, 1, 1 };
+       blit.dstOffsets[1] = { dst_size, 1, 1 };
 }
 
 size_t VulkanTexture1D::get_data_size() const