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

diff --git a/source/backends/vulkan/texture3d_backend.cpp b/source/backends/vulkan/texture3d_backend.cpp
index 581206c6..ee3490a7 100644
--- a/source/backends/vulkan/texture3d_backend.cpp
+++ b/source/backends/vulkan/texture3d_backend.cpp
@@ -46,7 +46,7 @@ void VulkanTexture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd
 
 			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);
@@ -55,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