Track the number of layers in Framebuffer

[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 44a25904161306afbb5ab52a9f24a420bb57edef..05ed51829d6bacb200fc5eef3a16cba36f5cf580 100644 (file)
--- a/source/backends/vulkan/texture3d_backend.cpp
+++ b/source/backends/vulkan/texture3d_backend.cpp
@@ -25,7 +25,6 @@ void VulkanTexture3D::fill_image_info(void *ii) const
        image_info->extent.width = self.width;
        image_info->extent.height = self.height;
        image_info->extent.depth = self.depth;
-       image_info->mipLevels = self.levels;
 }
 
 void VulkanTexture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, const void *data)
@@ -38,15 +37,14 @@ void VulkanTexture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd
        size_t data_size = wd*ht*dp*get_pixel_size(storage_fmt);
        void *staging = device.get_transfer_queue().prepare_transfer(this, false, data_size,
                [this, level, discard](){
-                       unsigned n_levels = static_cast<const Texture3D *>(this)->levels;
-                       change_layout(n_levels, level, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, discard);
+                       change_layout(level, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, discard);
                },
                [this, level, x, y, z, wd, ht, dp](VkCommandBuffer cmd_buf, VkBuffer staging_buf, size_t src_off){
                        const VulkanFunctions &vk = device.get_functions();
 
                        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);
@@ -55,13 +53,7 @@ void VulkanTexture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd
                        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));
-}
-
-void VulkanTexture3D::generate_mipmap()
-{
-       generate_mipmap_levels(static_cast<const Texture3D *>(this)->levels);
+       stage_pixels(staging, data, wd*ht*dp);
 }
 
 void VulkanTexture3D::fill_mipmap_blit(unsigned level, void *b)