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)
const Texture3D &self = *static_cast<const Texture3D *>(this);
auto level_size = self.get_level_size(level);
- int layer = (is_array() && dp==1 ? z : -1);
- synchronize(layer, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, (x==0 && y==0 && z==0 && wd==level_size.x && ht==level_size.y && dp==level_size.z));
+ bool discard = (x==0 && y==0 && z==0 && wd==level_size.x && ht==level_size.y && dp==level_size.z);
+ TransferQueue &tq = device.get_transfer_queue();
size_t data_size = wd*ht*dp*get_pixel_size(storage_fmt);
- void *staging = device.get_transfer_queue().prepare_transfer(data_size,
- [this, level, x, y, z, wd, ht, dp](VkCommandBuffer cmd_buf, VkBuffer staging_buf, size_t src_off){
- const VulkanFunctions &vk = device.get_functions();
-
+ void *staging = tq.prepare_transfer(this, false, data_size,
+ [this, level, discard](){
+ change_layout(level, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, discard);
+ },
+ [this, level, x, y, z, wd, ht, dp](const VulkanCommandRecorder &vkCmd, VkBuffer staging_buf, size_t src_off){
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);
region.imageOffset = { x, y, (is_array() ? 0 : z) };
region.imageExtent = { wd, ht, (is_array() ? 1 : dp) };
- vk.CmdCopyBufferToImage(cmd_buf, staging_buf, handle, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, ®ion);
+ vkCmd.CopyBufferToImage(staging_buf, handle, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, ®ion);
});
- const char *src = static_cast<const char *>(data);
- copy(src, src+data_size, static_cast<char *>(staging));
+ stage_pixels(staging, data, wd*ht*dp);
+ tq.finalize_transfer(staging);
+}
+
+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