Convert RGB pixel data to RGBA when staging

[libs/gl.git] / source / backends / vulkan / texture2d_backend.cpp

diff --git a/source/backends/vulkan/texture2d_backend.cpp b/source/backends/vulkan/texture2d_backend.cpp
index 71fb90cdbd4d90eec9bbbbcc91d2b06950dfa596..3b94e766dc21ff4be2ec2b88ad4c49d7d5c7c1bf 100644 (file)
--- a/source/backends/vulkan/texture2d_backend.cpp
+++ b/source/backends/vulkan/texture2d_backend.cpp
@@ -41,7 +41,7 @@ void VulkanTexture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsig
 
                        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;
@@ -50,8 +50,24 @@ void VulkanTexture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsig
                        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 VulkanTexture2D::generate_mipmap()
+{
+       generate_mipmap_levels(static_cast<const Texture2D *>(this)->levels);
+}
+
+void VulkanTexture2D::fill_mipmap_blit(unsigned level, void *b)
+{
+       const Texture2D &self = *static_cast<const Texture2D *>(this);
+       VkImageBlit &blit = *static_cast<VkImageBlit *>(b);
+
+       auto src_size = self.get_level_size(level);
+       auto dst_size = self.get_level_size(level+1);
+
+       blit.srcOffsets[1] = { static_cast<int>(src_size.x), static_cast<int>(src_size.y), 1 };
+       blit.dstOffsets[1] = { static_cast<int>(dst_size.x), static_cast<int>(dst_size.y), 1 };
 }
 
 Resource::AsyncLoader *VulkanTexture2D::load(IO::Seekable &, const Resources *)