X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Ftexture2d_backend.cpp;h=7edee3b2afa7ced6a67bd3e39f8e7dd67b724c64;hb=33253bf6d6a330181fda83ba23a6ac0a756d9a8d;hp=3b94e766dc21ff4be2ec2b88ad4c49d7d5c7c1bf;hpb=7b0a38db12c3d1aacb59520a3f4baa16d9ec0048;p=libs%2Fgl.git

diff --git a/source/backends/vulkan/texture2d_backend.cpp b/source/backends/vulkan/texture2d_backend.cpp
index 3b94e766..7edee3b2 100644
--- 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,11 +29,11 @@ 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();
@@ -51,11 +50,7 @@ void VulkanTexture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsig
 		});
 
 	stage_pixels(staging, data, wd*ht);
-}
-
-void VulkanTexture2D::generate_mipmap()
-{
-	generate_mipmap_levels(static_cast<const Texture2D *>(this)->levels);
+	tq.finalize_transfer(staging);
 }
 
 void VulkanTexture2D::fill_mipmap_blit(unsigned level, void *b)