X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Ftexture1d_backend.cpp;h=d66732bf6b7c62056058b38abf7cfa6e9d01e74d;hb=d2a23243b7f25e56ef098196b2962c103989143f;hp=91c6252a85d1544597f7a273e3e7e40a0fa8a381;hpb=8ab7589d65c4f8ca799f2a6886d128f4c36ff046;p=libs%2Fgl.git

diff --git a/source/backends/vulkan/texture1d_backend.cpp b/source/backends/vulkan/texture1d_backend.cpp
index 91c6252a..d66732bf 100644
--- a/source/backends/vulkan/texture1d_backend.cpp
+++ b/source/backends/vulkan/texture1d_backend.cpp
@@ -27,10 +27,14 @@ void VulkanTexture1D::sub_image(unsigned level, int x, unsigned wd, const void *
 	const Texture1D &self = *static_cast<const Texture1D *>(this);
 
 	unsigned level_size = self.get_level_size(level);
-	change_layout(self.levels, level, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, (x==0 && wd==level_size));
+	bool discard = (x==0 && wd==level_size);
 
 	size_t data_size = wd*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 Texture1D *>(this)->levels;
+			change_layout(n_levels, level, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, discard);
+		},
 		[this, level, x, wd](VkCommandBuffer cmd_buf, VkBuffer staging_buf, size_t src_off){
 			const VulkanFunctions &vk = device.get_functions();
 
@@ -49,6 +53,23 @@ void VulkanTexture1D::sub_image(unsigned level, int x, unsigned wd, const void *
 	copy(src, src+data_size, static_cast<char *>(staging));
 }
 
+void VulkanTexture1D::generate_mipmap()
+{
+	generate_mipmap_levels(static_cast<const Texture1D *>(this)->levels);
+}
+
+void VulkanTexture1D::fill_mipmap_blit(unsigned level, void *b)
+{
+	const Texture1D &self = *static_cast<const Texture1D *>(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.srcOffsets[1] = { src_size, 1, 1 };
+	blit.dstOffsets[1] = { dst_size, 1, 1 };
+}
+
 size_t VulkanTexture1D::get_data_size() const
 {
 	return 0;