X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Ftexturecube_backend.cpp;h=f0b941bfbe14e32d9e222db6e80cf0f940d5835a;hb=d01902f355b1ea9a038a7f96cab37e49c6b65419;hp=6a4e598c0c103b0ece427cbcd34bc07faa330f09;hpb=7b0a38db12c3d1aacb59520a3f4baa16d9ec0048;p=libs%2Fgl.git

diff --git a/source/backends/vulkan/texturecube_backend.cpp b/source/backends/vulkan/texturecube_backend.cpp
index 6a4e598c..f0b941bf 100644
--- 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,15 +31,13 @@ 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();
-
+		[this, face, level, x, y, wd, ht](const VulkanCommandRecorder &vkCmd, VkBuffer staging_buf, size_t src_off){
 			VkBufferImageCopy region = { };
 			region.bufferOffset = src_off;
 			region.imageSubresource.aspectMask = get_vulkan_aspect(get_components(storage_fmt));
@@ -49,15 +46,11 @@ void VulkanTextureCube::sub_image(unsigned face, unsigned level, int x, int y, u
 			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);
+			vkCmd.CopyBufferToImage(staging_buf, handle, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &region);
 		});
 
 	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)