X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Ftexturecube_backend.cpp;h=a92247d56746ed22426cf90a2e26867b718e3b35;hb=33253bf6d6a330181fda83ba23a6ac0a756d9a8d;hp=38348f34b8636abd0b09e0e3c478fd694abccaea;hpb=8ab7589d65c4f8ca799f2a6886d128f4c36ff046;p=libs%2Fgl.git

diff --git a/source/backends/vulkan/texturecube_backend.cpp b/source/backends/vulkan/texturecube_backend.cpp
index 38348f34..a92247d5 100644
--- a/source/backends/vulkan/texturecube_backend.cpp
+++ b/source/backends/vulkan/texturecube_backend.cpp
@@ -21,7 +21,6 @@ void VulkanTextureCube::fill_image_info(void *ii) const
 	image_info->imageType = VK_IMAGE_TYPE_2D;
 	image_info->extent.width = self.size;
 	image_info->extent.height = self.size;
-	image_info->mipLevels = self.levels;
 	image_info->arrayLayers = 6;
 }
 
@@ -30,16 +29,20 @@ 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);
-	change_layout(self.levels, level, 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);
 
+	TransferQueue &tq = device.get_transfer_queue();
 	size_t data_size = wd*ht*get_pixel_size(storage_fmt);
-	void *staging = device.get_transfer_queue().prepare_transfer(data_size,
+	void *staging = tq.prepare_transfer(this, false, data_size,
+		[this, level, discard](){
+			change_layout(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();
 
 			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;
@@ -48,8 +51,22 @@ 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);
+	tq.finalize_transfer(staging);
+}
+
+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