X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Ftexture2d_backend.cpp;h=7c6b55f1ee94dfb0652ef76ea8adb7e75675fbbf;hb=c218e021ede4e91c0fbc22ea9d636283409f847f;hp=e568d14f75843ea7ae57e6a6bbb520a777ed5712;hpb=d9c769b5847beefa378d2c5555f5b5d8e5d26c0e;p=libs%2Fgl.git

diff --git a/source/backends/vulkan/texture2d_backend.cpp b/source/backends/vulkan/texture2d_backend.cpp
index e568d14f..7c6b55f1 100644
--- a/source/backends/vulkan/texture2d_backend.cpp
+++ b/source/backends/vulkan/texture2d_backend.cpp
@@ -20,38 +20,24 @@ 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)
 {
-	const Texture2D &self = *static_cast<const Texture2D *>(this);
-
-	auto level_size = self.get_level_size(level);
-	bool discard = (x==0 && y==0 && wd==level_size.x && ht==level_size.y);
+	Texture2D::AsyncTransfer transfer(*static_cast<Texture2D *>(this), level, x, y, wd, ht);
+	stage_pixels(transfer.get_address(), data, wd*ht);
+}
 
-	size_t data_size = wd*ht*get_pixel_size(storage_fmt);
-	void *staging = device.get_transfer_queue().prepare_transfer(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);
-		},
-		[this, level, x, y, wd, ht](VkCommandBuffer cmd_buf, VkBuffer staging_buf, size_t src_off){
-			const VulkanFunctions &vk = device.get_functions();
+void VulkanTexture2D::fill_mipmap_blit(unsigned level, void *b)
+{
+	const Texture2D &self = *static_cast<const Texture2D *>(this);
+	VkImageBlit &blit = *static_cast<VkImageBlit *>(b);
 
-			VkBufferImageCopy region = { };
-			region.bufferOffset = src_off;
-			region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
-			region.imageSubresource.mipLevel = level;
-			region.imageSubresource.baseArrayLayer = 0;
-			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);
-		});
+	auto src_size = self.get_level_size(level);
+	auto dst_size = self.get_level_size(level+1);
 
-	const char *src = static_cast<const char *>(data);
-	copy(src, src+data_size, static_cast<char *>(staging));
+	blit.srcOffsets[1] = { static_cast<int>(src_size.x), static_cast<int>(src_size.y), 1 };
+	blit.dstOffsets[1] = { static_cast<int>(dst_size.x), static_cast<int>(dst_size.y), 1 };
 }
 
 Resource::AsyncLoader *VulkanTexture2D::load(IO::Seekable &, const Resources *)
@@ -68,5 +54,46 @@ void VulkanTexture2D::unload()
 {
 }
 
+
+void *VulkanTexture2D::AsyncTransfer::allocate()
+{
+	const Texture2D::AsyncTransfer &self = *static_cast<const Texture2D::AsyncTransfer *>(this);
+
+	Texture2D &tex = *self.texture;
+	unsigned level = self.level;
+	int x = self.x;
+	int y = self.y;
+	unsigned wd = self.width;
+	unsigned ht = self.height;
+
+	auto level_size = tex.get_level_size(level);
+	bool discard = (x==0 && y==0 && wd==level_size.x && ht==level_size.y);
+
+	TransferQueue &tq = tex.device.get_transfer_queue();
+	return tq.prepare_transfer(&tex, false, self.data_size,
+		[&tex, level, discard](){
+			tex.change_layout(level, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, discard);
+		},
+		[&tex, level, x, y, wd, ht](VkCommandBuffer cmd_buf, VkBuffer staging_buf, size_t src_off){
+			const VulkanFunctions &vk = tex.device.get_functions();
+
+			VkBufferImageCopy region = { };
+			region.bufferOffset = src_off;
+			region.imageSubresource.aspectMask = get_vulkan_aspect(get_components(tex.storage_fmt));
+			region.imageSubresource.mipLevel = level;
+			region.imageSubresource.baseArrayLayer = 0;
+			region.imageSubresource.layerCount = 1;
+			region.imageOffset = { x, y, 0 };
+			region.imageExtent = { wd, ht, 1 };
+			vk.CmdCopyBufferToImage(cmd_buf, staging_buf, tex.handle, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &region);
+		});
+}
+
+void VulkanTexture2D::AsyncTransfer::finalize()
+{
+	const Texture2D::AsyncTransfer &self = *static_cast<const Texture2D::AsyncTransfer *>(this);
+	self.texture->device.get_transfer_queue().finalize_transfer(self.dest_addr);
+}
+
 } // namespace GL
 } // namespace Msp