X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Ftexture1d_backend.cpp;h=59ef60d010c1bb8a310fee19dcb1fc85312a37b1;hb=c585c065b7831eb6ae05e48edc36953d2534db2b;hp=aaa3c385bb41e030d4a3ab6c39d7f66d871e6d13;hpb=a16145549dc87c3b12671f797bd77b14bcc7786b;p=libs%2Fgl.git

diff --git a/source/backends/vulkan/texture1d_backend.cpp b/source/backends/vulkan/texture1d_backend.cpp
index aaa3c385..59ef60d0 100644
--- 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)
@@ -27,26 +26,40 @@ void VulkanTexture1D::sub_image(unsigned level, int x, unsigned wd, const void *
 	const Texture1D &self = *static_cast<const Texture1D *>(this);
 
 	unsigned level_size = self.get_level_size(level);
-	synchronize(-1, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, (x==0 && wd==level_size));
+	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,
-		[this, level, x, wd](VkCommandBuffer cmd_buf, VkBuffer staging_buf, size_t src_off){
-			const VulkanFunctions &vk = device.get_functions();
-
+	void *staging = tq.prepare_transfer(this, false, data_size,
+		[this, level, discard](){
+			change_layout(level, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, discard);
+		},
+		[this, level, x, wd](const VulkanCommandRecorder &vkCmd, VkBuffer staging_buf, size_t src_off){
 			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;
 			region.imageOffset = { x, 0, 0 };
 			region.imageExtent = { wd, 1, 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);
 		});
 
-	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