X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Ftexturecube_backend.cpp;h=98f000447c8a2f3aef69cacdfe20e929719d73dc;hb=d2a23243b7f25e56ef098196b2962c103989143f;hp=fe528921f8c99b135537e4ae397f2978cabb62cf;hpb=a16145549dc87c3b12671f797bd77b14bcc7786b;p=libs%2Fgl.git

diff --git a/source/backends/vulkan/texturecube_backend.cpp b/source/backends/vulkan/texturecube_backend.cpp
index fe528921..98f00044 100644
--- a/source/backends/vulkan/texturecube_backend.cpp
+++ b/source/backends/vulkan/texturecube_backend.cpp
@@ -30,10 +30,14 @@ void VulkanTextureCube::sub_image(unsigned face, unsigned level, int x, int y, u
 	const TextureCube &self = *static_cast<const TextureCube *>(this);
 
 	unsigned level_size = self.get_level_size(level);
-	synchronize(face, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, (x==0 && y==0 && wd==level_size && ht==level_size));
+	bool discard = (x==0 && y==0 && wd==level_size && ht==level_size);
 
 	size_t data_size = wd*ht*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 TextureCube *>(this)->levels;
+			change_layout(n_levels, level, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, discard);
+		},
 		[this, face, level, x, y, wd, ht](VkCommandBuffer cmd_buf, VkBuffer staging_buf, size_t src_off){
 			const VulkanFunctions &vk = device.get_functions();
 
@@ -52,6 +56,25 @@ void VulkanTextureCube::sub_image(unsigned face, unsigned level, int x, int y, u
 	copy(src, src+data_size, static_cast<char *>(staging));
 }
 
+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
 {
 	return 0;