X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Ftexturecube_backend.cpp;h=6a4e598c0c103b0ece427cbcd34bc07faa330f09;hb=7b0a38db12c3d1aacb59520a3f4baa16d9ec0048;hp=5b7bd368760f257698765aeff638ce8a427188ff;hpb=682d3ceda19df700ce6590028717e4f0042783ec;p=libs%2Fgl.git

diff --git a/source/backends/vulkan/texturecube_backend.cpp b/source/backends/vulkan/texturecube_backend.cpp
index 5b7bd368..6a4e598c 100644
--- a/source/backends/vulkan/texturecube_backend.cpp
+++ b/source/backends/vulkan/texturecube_backend.cpp
@@ -43,7 +43,7 @@ void VulkanTextureCube::sub_image(unsigned face, unsigned level, int x, int y, u
 
 			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 = face;
 			region.imageSubresource.layerCount = 1;
@@ -52,8 +52,26 @@ void VulkanTextureCube::sub_image(unsigned face, unsigned level, int x, int y, u
 			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);
+}
+
+void VulkanTextureCube::generate_mipmap()
+{
+	generate_mipmap_levels(static_cast<const TextureCube *>(this)->levels);
+}
+
+void VulkanTextureCube::fill_mipmap_blit(unsigned level, void *b)
+{
+	const TextureCube &self = *static_cast<const TextureCube *>(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.srcSubresource.layerCount = 6;
+	blit.dstSubresource.layerCount = 6;
+	blit.srcOffsets[1] = { src_size, src_size, 1 };
+	blit.dstOffsets[1] = { dst_size, dst_size, 1 };
 }
 
 size_t VulkanTextureCube::get_data_size() const