image_info->imageType = VK_IMAGE_TYPE_2D;
image_info->extent.width = self.size;
image_info->extent.height = self.size;
- image_info->mipLevels = self.levels;
image_info->arrayLayers = 6;
}
unsigned level_size = self.get_level_size(level);
bool discard = (x==0 && y==0 && wd==level_size && ht==level_size);
+ TransferQueue &tq = device.get_transfer_queue();
size_t data_size = wd*ht*get_pixel_size(storage_fmt);
- void *staging = device.get_transfer_queue().prepare_transfer(this, false, data_size,
+ void *staging = tq.prepare_transfer(this, false, data_size,
[this, level, discard](){
- unsigned n_levels = static_cast<const TextureCube *>(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, face, level, x, y, wd, ht](VkCommandBuffer cmd_buf, VkBuffer staging_buf, size_t src_off){
- const VulkanFunctions &vk = device.get_functions();
-
+ [this, face, level, x, y, wd, ht](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 = face;
region.imageSubresource.layerCount = 1;
region.imageOffset = { x, y, 0 };
region.imageExtent = { wd, ht, 1 };
- 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));
-}
-
-void VulkanTextureCube::generate_mipmap()
-{
- generate_mipmap_levels(static_cast<const TextureCube *>(this)->levels);
+ stage_pixels(staging, data, wd*ht);
+ tq.finalize_transfer(staging);
}
void VulkanTextureCube::fill_mipmap_blit(unsigned level, void *b)