Use the correct aspect mask for uploading texture data

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

diff --git a/source/backends/vulkan/texture3d_backend.cpp b/source/backends/vulkan/texture3d_backend.cpp
index 581206c671bf40498344d59a2387eb1c68fe1817..86653ef2b04796f4148050b11780e16884fc932e 100644 (file)
--- a/source/backends/vulkan/texture3d_backend.cpp
+++ b/source/backends/vulkan/texture3d_backend.cpp
@@ -46,7 +46,7 @@ void VulkanTexture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd
 
                        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 = (is_array() ? z : 0);
                        region.imageSubresource.layerCount = (is_array() ? dp : 1);
@@ -59,6 +59,25 @@ void VulkanTexture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd
        copy(src, src+data_size, static_cast<char *>(staging));
 }
 
+void VulkanTexture3D::generate_mipmap()
+{
+       generate_mipmap_levels(static_cast<const Texture3D *>(this)->levels);
+}
+
+void VulkanTexture3D::fill_mipmap_blit(unsigned level, void *b)
+{
+       const Texture3D &self = *static_cast<const Texture3D *>(this);
+       VkImageBlit &blit = *static_cast<VkImageBlit *>(b);
+
+       LinAl::Vector<int, 3> src_size = self.get_level_size(level);
+       LinAl::Vector<int, 3> dst_size = self.get_level_size(level+1);
+
+       blit.srcSubresource.layerCount = (is_array() ? self.depth : 1);
+       blit.dstSubresource.layerCount = blit.srcSubresource.layerCount;
+       blit.srcOffsets[1] = { src_size.x, src_size.y, (is_array() ? 1 : src_size.z) };
+       blit.dstOffsets[1] = { dst_size.x, dst_size.y, (is_array() ? 1 : dst_size.z) };
+}
+
 bool VulkanTexture3D::is_array() const
 {
        return view_type==VK_IMAGE_VIEW_TYPE_2D_ARRAY;