Use the correct aspect mask for uploading texture data

[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..e40dfe4fedf3003287503f195f4b2426cc86cd37 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;
@@ -54,6 +54,23 @@ void VulkanTexture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsig
        copy(src, src+data_size, static_cast<char *>(staging));
 }
 
+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 *)
 {
        throw logic_error("Texture2D::load is unimplemented");