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

diff --git a/source/backends/vulkan/texture1d_backend.cpp b/source/backends/vulkan/texture1d_backend.cpp
index e28ec423..e27f371b 100644
--- a/source/backends/vulkan/texture1d_backend.cpp
+++ b/source/backends/vulkan/texture1d_backend.cpp
@@ -40,7 +40,7 @@ void VulkanTexture1D::sub_image(unsigned level, int x, unsigned wd, const void *
 
 			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 = 0;
 			region.imageSubresource.layerCount = 1;
@@ -49,8 +49,24 @@ void VulkanTexture1D::sub_image(unsigned level, int x, unsigned wd, const void *
 			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);
+}
+
+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