X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Ftexture3d_backend.cpp;h=ee3490a77263e43e25ddb6d967e2d839926897ab;hb=7b0a38db12c3d1aacb59520a3f4baa16d9ec0048;hp=03a957344e11083fb0bfdcb0ac8e2eb051aa28a7;hpb=8ab7589d65c4f8ca799f2a6886d128f4c36ff046;p=libs%2Fgl.git

diff --git a/source/backends/vulkan/texture3d_backend.cpp b/source/backends/vulkan/texture3d_backend.cpp
index 03a95734..ee3490a7 100644
--- a/source/backends/vulkan/texture3d_backend.cpp
+++ b/source/backends/vulkan/texture3d_backend.cpp
@@ -34,16 +34,19 @@ void VulkanTexture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd
 
 	auto level_size = self.get_level_size(level);
 	bool discard = (x==0 && y==0 && z==0 && wd==level_size.x && ht==level_size.y && dp==level_size.z);
-	change_layout(self.levels, level, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, discard);
 
 	size_t data_size = wd*ht*dp*get_pixel_size(storage_fmt);
-	void *staging = device.get_transfer_queue().prepare_transfer(data_size,
+	void *staging = device.get_transfer_queue().prepare_transfer(this, false, data_size,
+		[this, level, discard](){
+			unsigned n_levels = static_cast<const Texture3D *>(this)->levels;
+			change_layout(n_levels, level, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, discard);
+		},
 		[this, level, x, y, z, wd, ht, dp](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 = (is_array() ? z : 0);
 			region.imageSubresource.layerCount = (is_array() ? dp : 1);
@@ -52,8 +55,26 @@ void VulkanTexture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd
 			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*ht*dp);
+}
+
+void VulkanTexture3D::generate_mipmap()
+{
+	generate_mipmap_levels(static_cast<const Texture3D *>(this)->levels);
+}
+
+void VulkanTexture3D::fill_mipmap_blit(unsigned level, void *b)
+{
+	const Texture3D &self = *static_cast<const Texture3D *>(this);
+	VkImageBlit &blit = *static_cast<VkImageBlit *>(b);
+
+	LinAl::Vector<int, 3> src_size = self.get_level_size(level);
+	LinAl::Vector<int, 3> dst_size = self.get_level_size(level+1);
+
+	blit.srcSubresource.layerCount = (is_array() ? self.depth : 1);
+	blit.dstSubresource.layerCount = blit.srcSubresource.layerCount;
+	blit.srcOffsets[1] = { src_size.x, src_size.y, (is_array() ? 1 : src_size.z) };
+	blit.dstOffsets[1] = { dst_size.x, dst_size.y, (is_array() ? 1 : dst_size.z) };
 }
 
 bool VulkanTexture3D::is_array() const