From a16145549dc87c3b12671f797bd77b14bcc7786b Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Mon, 22 Nov 2021 01:41:45 +0200 Subject: [PATCH] Implement textures and samplers for Vulkan Currently render target textures get a useless layout transition to SHADER_READ_ONLY_OPTIMAL if there's any transfers on the same frame. Mipmap generation and asynchronous uploading of textures does not work yet. --- source/backends/vulkan/commands_backend.cpp | 5 +- source/backends/vulkan/destroyqueue.cpp | 10 ++ source/backends/vulkan/destroyqueue.h | 2 + .../backends/vulkan/framebuffer_backend.cpp | 6 + source/backends/vulkan/framebuffer_backend.h | 2 + source/backends/vulkan/memoryallocator.cpp | 14 +++ source/backends/vulkan/memoryallocator.h | 1 + .../backends/vulkan/pipelinestate_backend.cpp | 48 +++++++- source/backends/vulkan/sampler_backend.cpp | 116 ++++++++++++++++-- source/backends/vulkan/sampler_backend.h | 11 +- source/backends/vulkan/synchronizer.cpp | 81 +++++++++++- source/backends/vulkan/synchronizer.h | 14 +++ source/backends/vulkan/texture1d_backend.cpp | 42 ++++++- source/backends/vulkan/texture1d_backend.h | 1 + source/backends/vulkan/texture2d_backend.cpp | 39 +++++- source/backends/vulkan/texture2d_backend.h | 1 + .../vulkan/texture2darray_backend.cpp | 10 ++ .../backends/vulkan/texture2darray_backend.h | 2 + .../vulkan/texture2dmultisample_backend.cpp | 13 ++ .../vulkan/texture2dmultisample_backend.h | 2 + source/backends/vulkan/texture3d_backend.cpp | 46 ++++++- source/backends/vulkan/texture3d_backend.h | 1 + source/backends/vulkan/texture_backend.cpp | 60 ++++++++- source/backends/vulkan/texture_backend.h | 4 + .../backends/vulkan/texturecube_backend.cpp | 40 +++++- source/backends/vulkan/texturecube_backend.h | 1 + source/backends/vulkan/vulkan.cpp | 8 ++ source/backends/vulkan/vulkan.h | 29 +++++ 28 files changed, 575 insertions(+), 34 deletions(-) diff --git a/source/backends/vulkan/commands_backend.cpp b/source/backends/vulkan/commands_backend.cpp index 84bc104a..54282c36 100644 --- a/source/backends/vulkan/commands_backend.cpp +++ b/source/backends/vulkan/commands_backend.cpp @@ -71,17 +71,20 @@ void VulkanCommands::begin_render_pass(bool clear, const ClearValue *clear_value Synchronizer &sync = device.get_synchronizer(); sync.reset(); - sync.barrier(current_buffer); bool to_present = false; unsigned n_attachments = framebuffer->get_format().size(); for(unsigned i=0; i(framebuffer->get_attachment(i))) to_present = true; + if(!to_present) + framebuffer->synchronize(clear); VkRenderPass render_pass = device.get_pipeline_cache().get_render_pass(framebuffer->get_format(), clear, !clear_values, to_present); framebuffer->refresh(); + sync.barrier(current_buffer); + VkRenderPassBeginInfo begin_info = { }; begin_info.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO; begin_info.renderPass = handle_cast<::VkRenderPass>(render_pass); diff --git a/source/backends/vulkan/destroyqueue.cpp b/source/backends/vulkan/destroyqueue.cpp index bdfea432..0c3e17c1 100644 --- a/source/backends/vulkan/destroyqueue.cpp +++ b/source/backends/vulkan/destroyqueue.cpp @@ -30,11 +30,21 @@ void DestroyQueue::destroy(VkFramebuffer handle) destroy(handle); } +void DestroyQueue::destroy(VkImage handle, unsigned mem_id) +{ + destroy(handle, mem_id); +} + void DestroyQueue::destroy(VkImageView handle) { destroy(handle); } +void DestroyQueue::destroy(VkSampler handle) +{ + destroy(handle); +} + void DestroyQueue::destroy(VkSemaphore handle) { destroy(handle); diff --git a/source/backends/vulkan/destroyqueue.h b/source/backends/vulkan/destroyqueue.h index 577e89d0..43ceeeaa 100644 --- a/source/backends/vulkan/destroyqueue.h +++ b/source/backends/vulkan/destroyqueue.h @@ -32,7 +32,9 @@ public: void destroy(VkBuffer, unsigned); void destroy(VkFence); void destroy(VkFramebuffer); + void destroy(VkImage, unsigned); void destroy(VkImageView); + void destroy(VkSampler); void destroy(VkSemaphore); private: diff --git a/source/backends/vulkan/framebuffer_backend.cpp b/source/backends/vulkan/framebuffer_backend.cpp index 96653fe1..9320fffb 100644 --- a/source/backends/vulkan/framebuffer_backend.cpp +++ b/source/backends/vulkan/framebuffer_backend.cpp @@ -82,6 +82,12 @@ void VulkanFramebuffer::update(unsigned) const set_vulkan_object_name(); } +void VulkanFramebuffer::synchronize(bool discard) const +{ + for(const Framebuffer::Attachment &a: static_cast(this)->attachments) + a.tex->synchronize(a.layer, get_vulkan_attachment_layout(get_components(a.tex->get_format())), discard); +} + void VulkanFramebuffer::set_debug_name(const string &name) { #ifdef DEBUG diff --git a/source/backends/vulkan/framebuffer_backend.h b/source/backends/vulkan/framebuffer_backend.h index d9d7cc90..9a616875 100644 --- a/source/backends/vulkan/framebuffer_backend.h +++ b/source/backends/vulkan/framebuffer_backend.h @@ -31,6 +31,8 @@ protected: void update(unsigned) const; void require_complete() const { } + void synchronize(bool = false) const; + void set_debug_name(const std::string &); void set_vulkan_object_name() const; }; diff --git a/source/backends/vulkan/memoryallocator.cpp b/source/backends/vulkan/memoryallocator.cpp index 6ffcc9fc..6ef5d2bd 100644 --- a/source/backends/vulkan/memoryallocator.cpp +++ b/source/backends/vulkan/memoryallocator.cpp @@ -91,6 +91,20 @@ unsigned MemoryAllocator::allocate(VkBuffer buffer, MemoryType type) return id; } +unsigned MemoryAllocator::allocate(VkImage image, MemoryType type) +{ + const VulkanFunctions &vk = device.get_functions(); + + VkMemoryRequirements requirements; + vk.GetImageMemoryRequirements(image, requirements); + + unsigned id = allocate(requirements.size, requirements.memoryTypeBits, type); + + vk.BindImageMemory(image, get_allocation(id).memory, 0); + + return id; +} + void MemoryAllocator::release(unsigned id) { Allocation &alloc = get_allocation(id); diff --git a/source/backends/vulkan/memoryallocator.h b/source/backends/vulkan/memoryallocator.h index b7603f15..f8d08c4f 100644 --- a/source/backends/vulkan/memoryallocator.h +++ b/source/backends/vulkan/memoryallocator.h @@ -45,6 +45,7 @@ private: public: unsigned allocate(VkBuffer, MemoryType); + unsigned allocate(VkImage, MemoryType); void release(unsigned); std::size_t get_allocation_size(unsigned) const; diff --git a/source/backends/vulkan/pipelinestate_backend.cpp b/source/backends/vulkan/pipelinestate_backend.cpp index 4714ff67..444d5f66 100644 --- a/source/backends/vulkan/pipelinestate_backend.cpp +++ b/source/backends/vulkan/pipelinestate_backend.cpp @@ -51,6 +51,15 @@ void VulkanPipelineState::update() const changed_sets |= 1<<(u.binding>>20); u.changed = false; } + for(const PipelineState::BoundTexture &t: self.textures) + if(t.changed || changed_sets==~0U) + { + t.used = self.shprog->uses_binding(t.binding); + changed_sets |= 1<<(t.binding>>20); + if(t.sampler) + t.sampler->refresh(); + t.changed = false; + } descriptor_set_handles.resize(self.shprog->get_n_descriptor_sets()); for(unsigned i=0; i(result, b.binding); result = hash_update<64>(result, reinterpret_cast(b.block)); } + for(const PipelineState::BoundTexture &t: self.textures) + if(t.used && (t.binding>>20)==index) + { + result = hash_update<64>(result, t.binding); + result = hash_update<64>(result, reinterpret_cast(t.texture)); + result = hash_update<64>(result, reinterpret_cast(t.sampler)); + } return result; } @@ -282,13 +298,20 @@ unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, vector=0 && static_cast(u.binding>>20)==index) ++n_buffers; - - StructureBuilder sb(buffer, 2); - VkWriteDescriptorSet *&writes = sb.add(n_buffers); + unsigned n_images = 0; + for(const PipelineState::BoundTexture &t: self.textures) + if(t.used && (t.binding>>20)==index) + ++n_images; + unsigned n_writes = n_buffers+n_images; + + StructureBuilder sb(buffer, 3); + VkWriteDescriptorSet *&writes = sb.add(n_writes); VkDescriptorBufferInfo *&buffers = sb.add(n_buffers); + VkDescriptorImageInfo *&images = sb.add(n_images); VkWriteDescriptorSet *write_ptr = writes; VkDescriptorBufferInfo *buffer_ptr = buffers; + VkDescriptorImageInfo *image_ptr = images; for(const PipelineState::BoundUniformBlock &u: self.uniform_blocks) if(u.used && u.binding>=0 && static_cast(u.binding>>20)==index) @@ -307,7 +330,24 @@ unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, vector>20)==index) + { + image_ptr->sampler = handle_cast<::VkSampler>(t.sampler->handle); + image_ptr->imageView = handle_cast<::VkImageView>(t.texture->view_handle); + image_ptr->imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + + write_ptr->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; + write_ptr->dstBinding = t.binding&0xFFFFF; + write_ptr->descriptorCount = 1; + write_ptr->descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER; + write_ptr->pImageInfo = image_ptr; + + ++image_ptr; + ++write_ptr; + } + + return n_writes; } void VulkanPipelineState::apply(VkCommandBuffer command_buffer) const diff --git a/source/backends/vulkan/sampler_backend.cpp b/source/backends/vulkan/sampler_backend.cpp index f4162ed0..134be91b 100644 --- a/source/backends/vulkan/sampler_backend.cpp +++ b/source/backends/vulkan/sampler_backend.cpp @@ -1,30 +1,128 @@ +#include "destroyqueue.h" +#include "device.h" #include "sampler.h" #include "sampler_backend.h" +#include "vulkan.h" using namespace std; namespace Msp { namespace GL { -VulkanSampler::VulkanSampler() -{ - throw logic_error("VulkanSampler is unimplemented"); -} +VulkanSampler::VulkanSampler(): + device(Device::get_current()) +{ } VulkanSampler::VulkanSampler(VulkanSampler &&other): - handle(other.handle) + device(other.device), + handle(other.handle), + debug_name(move(other.debug_name)) { other.handle = 0; } VulkanSampler::~VulkanSampler() -{ } +{ + if(handle) + device.get_destroy_queue().destroy(handle); +} void VulkanSampler::update(unsigned) const -{ } +{ + const Sampler &self = *static_cast(this); + const VulkanFunctions &vk = device.get_functions(); -void VulkanSampler::set_debug_name(const string &) -{ } + if(handle) + device.get_destroy_queue().destroy(handle); + + VkSamplerCreateInfo sampler_info = { }; + sampler_info.sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO; + sampler_info.magFilter = static_cast(get_vulkan_filter(self.mag_filter)); + sampler_info.minFilter = static_cast(get_vulkan_filter(self.min_filter)); + sampler_info.mipmapMode = static_cast(get_vulkan_mipmap_mode(self.min_filter)); + sampler_info.addressModeU = static_cast(get_vulkan_address_mode(self.wrap_s)); + sampler_info.addressModeV = static_cast(get_vulkan_address_mode(self.wrap_t)); + sampler_info.addressModeW = static_cast(get_vulkan_address_mode(self.wrap_r)); + sampler_info.anisotropyEnable = (self.max_anisotropy>1.0f); + sampler_info.maxAnisotropy = self.max_anisotropy; + sampler_info.compareEnable = self.compare; + sampler_info.compareOp = static_cast(get_vulkan_predicate(self.cmp_func)); + sampler_info.maxLod = VK_LOD_CLAMP_NONE; + // TODO Vulkan does not allow arbitrary border colors + + vk.CreateSampler(sampler_info, handle); + +#ifdef DEBUG + if(!debug_name.empty()) + set_vulkan_object_name(); +#endif +} + +void VulkanSampler::set_debug_name(const string &name) +{ +#ifdef DEBUG + debug_name = name; + if(handle) + set_vulkan_object_name(); +#else + (void)name; +#endif +} + +void VulkanSampler::set_vulkan_object_name() const +{ +#ifdef DEBUG + const VulkanFunctions &vk = device.get_functions(); + + VkDebugUtilsObjectNameInfoEXT name_info = { }; + name_info.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT; + name_info.objectType = VK_OBJECT_TYPE_SAMPLER; + name_info.objectHandle = reinterpret_cast(handle); + name_info.pObjectName = debug_name.c_str(); + vk.SetDebugUtilsObjectName(name_info); +#endif +} + + +unsigned get_vulkan_filter(unsigned filter) +{ + switch(filter) + { + case NEAREST: + case NEAREST_MIPMAP_NEAREST: + case NEAREST_MIPMAP_LINEAR: return VK_FILTER_NEAREST; + case LINEAR: + case LINEAR_MIPMAP_NEAREST: + case LINEAR_MIPMAP_LINEAR: return VK_FILTER_LINEAR; + default: throw invalid_argument("get_vulkan_filter"); + } +} + +unsigned get_vulkan_mipmap_mode(unsigned filter) +{ + switch(filter) + { + case NEAREST: + case LINEAR: return VK_SAMPLER_MIPMAP_MODE_NEAREST; + case NEAREST_MIPMAP_NEAREST: + case NEAREST_MIPMAP_LINEAR: + case LINEAR_MIPMAP_NEAREST: + case LINEAR_MIPMAP_LINEAR: return VK_SAMPLER_MIPMAP_MODE_LINEAR; + default: throw invalid_argument("get_vulkan_mipmap_mode"); + } +} + +unsigned get_vulkan_address_mode(unsigned wrap) +{ + switch(wrap) + { + case REPEAT: return VK_SAMPLER_ADDRESS_MODE_REPEAT; + case CLAMP_TO_EDGE: return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE; + case CLAMP_TO_BORDER: return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER; + case MIRRORED_REPEAT: return VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT; + default: throw invalid_argument("get_vulkan_address_mode"); + } +} } // namespace GL } // namespace Msp diff --git a/source/backends/vulkan/sampler_backend.h b/source/backends/vulkan/sampler_backend.h index 58ca8a46..f96d43c8 100644 --- a/source/backends/vulkan/sampler_backend.h +++ b/source/backends/vulkan/sampler_backend.h @@ -6,12 +6,16 @@ namespace Msp { namespace GL { +class Device; + class VulkanSampler { friend class VulkanPipelineState; protected: - VkSampler handle; + Device &device; + mutable VkSampler handle = 0; + std::string debug_name; VulkanSampler(); VulkanSampler(VulkanSampler &&); @@ -22,10 +26,15 @@ protected: void update(unsigned) const; void set_debug_name(const std::string &); + void set_vulkan_object_name() const; }; using SamplerBackend = VulkanSampler; +unsigned get_vulkan_filter(unsigned); +unsigned get_vulkan_mipmap_mode(unsigned); +unsigned get_vulkan_address_mode(unsigned); + } // namespace GL } // namespace Msp diff --git a/source/backends/vulkan/synchronizer.cpp b/source/backends/vulkan/synchronizer.cpp index 85c813e2..7ce7c08a 100644 --- a/source/backends/vulkan/synchronizer.cpp +++ b/source/backends/vulkan/synchronizer.cpp @@ -35,17 +35,38 @@ void Synchronizer::access(VkBuffer buffer, size_t offset, size_t size) i->pending_write = true; } +void Synchronizer::access(VkImage image, unsigned aspect, int layer, unsigned layout, bool discard) +{ + auto i = find_member(image_accesses, image, &ImageAccess::image); + if(i==image_accesses.end()) + { + i = image_accesses.emplace(image_accesses.end()); + i->image = image; + i->aspect = aspect; + i->layer = layer; + i->current_layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + } + + if(discard) + i->current_layout = VK_IMAGE_LAYOUT_UNDEFINED; + if(layer!=i->layer) + i->layer = -1; + i->pending_layout = layout; +} + void Synchronizer::reset() { for(BufferAccess &b: buffer_accesses) b.pending_write = false; + for(ImageAccess &i: image_accesses) + i.pending_layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; } void Synchronizer::barrier(VkCommandBuffer command_buffer) { const VulkanFunctions &vk = device.get_functions(); - if(buffer_accesses.empty()) + if(buffer_accesses.empty() && image_accesses.empty()) return; VkPipelineStageFlags src_stage = 0; @@ -75,13 +96,52 @@ void Synchronizer::barrier(VkCommandBuffer command_buffer) dst_stage |= (b.pending_write ? buffer_write_stages : buffer_read_stages); } + static constexpr VkPipelineStageFlags image_read_stages = VK_PIPELINE_STAGE_VERTEX_SHADER_BIT|VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT| + VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT|VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT; + static constexpr VkPipelineStageFlags image_write_stages = VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT| + VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT|VK_PIPELINE_STAGE_TRANSFER_BIT; + + vector image_barriers; + image_barriers.reserve(image_accesses.size()); + for(const ImageAccess &i: image_accesses) + { + image_barriers.emplace_back(VkImageMemoryBarrier{ }); + VkImageMemoryBarrier &barrier = image_barriers.back(); + + barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; + barrier.srcAccessMask = (is_write_layout(i.current_layout) ? VK_ACCESS_MEMORY_WRITE_BIT : 0); + barrier.dstAccessMask = (is_write_layout(i.pending_layout) ? VK_ACCESS_MEMORY_WRITE_BIT : VK_ACCESS_MEMORY_READ_BIT); + barrier.oldLayout = static_cast(i.current_layout); + barrier.newLayout = static_cast(i.pending_layout); + barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.image = handle_cast<::VkImage>(i.image); + barrier.subresourceRange.aspectMask = i.aspect; + barrier.subresourceRange.baseMipLevel = 0; + barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS; + if(i.layer>=0) + { + barrier.subresourceRange.baseArrayLayer = i.layer; + barrier.subresourceRange.layerCount = 1; + } + else + { + barrier.subresourceRange.baseArrayLayer = 0; + barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS; + } + + if(i.current_layout!=VK_IMAGE_LAYOUT_UNDEFINED) + src_stage |= (is_write_layout(i.current_layout) ? image_write_stages : image_read_stages); + dst_stage |= (is_write_layout(i.pending_layout) ? image_write_stages : image_read_stages); + } + if(!src_stage) src_stage = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT; if(!dst_stage) dst_stage = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT; vk.CmdPipelineBarrier(command_buffer, src_stage, dst_stage, 0, 0, 0, - buffer_barriers.size(), buffer_barriers.data(), 0, 0); + buffer_barriers.size(), buffer_barriers.data(), image_barriers.size(), image_barriers.data()); for(auto i=buffer_accesses.begin(); i!=buffer_accesses.end(); ) { @@ -93,6 +153,23 @@ void Synchronizer::barrier(VkCommandBuffer command_buffer) ++i; } } + + for(auto i=image_accesses.begin(); i!=image_accesses.end(); ) + { + if(i->pending_layout==VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) + i = image_accesses.erase(i); + else + { + i->current_layout = i->pending_layout; + ++i; + } + } +} + +bool Synchronizer::is_write_layout(unsigned layout) +{ + return layout==VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL || layout==VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL || + layout==VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL; } } // namespace GL diff --git a/source/backends/vulkan/synchronizer.h b/source/backends/vulkan/synchronizer.h index ea3d0759..48699540 100644 --- a/source/backends/vulkan/synchronizer.h +++ b/source/backends/vulkan/synchronizer.h @@ -11,6 +11,15 @@ namespace GL { class Synchronizer { private: + struct ImageAccess + { + VkImage image = 0; + unsigned aspect; + int layer = -1; + unsigned current_layout; + unsigned pending_layout; + }; + struct BufferAccess { VkBuffer buffer = 0; @@ -22,13 +31,18 @@ private: Device &device; std::vector buffer_accesses; + std::vector image_accesses; public: Synchronizer(Device &); void access(VkBuffer, std::size_t, std::size_t); + void access(VkImage, unsigned, int, unsigned, bool); void reset(); void barrier(VkCommandBuffer); + +private: + bool is_write_layout(unsigned); }; } // namespace GL diff --git a/source/backends/vulkan/texture1d_backend.cpp b/source/backends/vulkan/texture1d_backend.cpp index 8cc43f3d..aaa3c385 100644 --- a/source/backends/vulkan/texture1d_backend.cpp +++ b/source/backends/vulkan/texture1d_backend.cpp @@ -1,17 +1,53 @@ +#include "device.h" +#include "texture1d.h" #include "texture1d_backend.h" #include "vulkan.h" +using namespace std; + namespace Msp { namespace GL { VulkanTexture1D::VulkanTexture1D(): Texture(VK_IMAGE_VIEW_TYPE_1D) +{ } + +void VulkanTexture1D::fill_image_info(void *ii) const { - throw std::logic_error("VulkanTexture1D is unimplemented"); + const Texture1D &self = *static_cast(this); + + VkImageCreateInfo *image_info = static_cast(ii); + image_info->imageType = VK_IMAGE_TYPE_1D; + image_info->extent.width = self.width; + image_info->mipLevels = self.levels; } -void VulkanTexture1D::sub_image(unsigned, int, unsigned, const void *) -{ } +void VulkanTexture1D::sub_image(unsigned level, int x, unsigned wd, const void *data) +{ + const Texture1D &self = *static_cast(this); + + unsigned level_size = self.get_level_size(level); + synchronize(-1, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, (x==0 && wd==level_size)); + + size_t data_size = wd*get_pixel_size(storage_fmt); + void *staging = device.get_transfer_queue().prepare_transfer(data_size, + [this, level, x, wd](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.mipLevel = level; + region.imageSubresource.baseArrayLayer = 0; + region.imageSubresource.layerCount = 1; + region.imageOffset = { x, 0, 0 }; + region.imageExtent = { wd, 1, 1 }; + vk.CmdCopyBufferToImage(cmd_buf, staging_buf, handle, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, ®ion); + }); + + const char *src = static_cast(data); + copy(src, src+data_size, static_cast(staging)); +} size_t VulkanTexture1D::get_data_size() const { diff --git a/source/backends/vulkan/texture1d_backend.h b/source/backends/vulkan/texture1d_backend.h index 59e48946..424d262a 100644 --- a/source/backends/vulkan/texture1d_backend.h +++ b/source/backends/vulkan/texture1d_backend.h @@ -11,6 +11,7 @@ class VulkanTexture1D: public Texture protected: VulkanTexture1D(); + virtual void fill_image_info(void *) const; void sub_image(unsigned, int, unsigned, const void *); public: diff --git a/source/backends/vulkan/texture2d_backend.cpp b/source/backends/vulkan/texture2d_backend.cpp index a80e1f94..2d6ee131 100644 --- a/source/backends/vulkan/texture2d_backend.cpp +++ b/source/backends/vulkan/texture2d_backend.cpp @@ -1,3 +1,5 @@ +#include "device.h" +#include "texture2d.h" #include "texture2d_backend.h" #include "vulkan.h" @@ -10,9 +12,42 @@ VulkanTexture2D::VulkanTexture2D(): Texture(VK_IMAGE_VIEW_TYPE_2D) { } -void VulkanTexture2D::sub_image(unsigned, int, int, unsigned, unsigned, const void *) +void VulkanTexture2D::fill_image_info(void *ii) const { - throw logic_error("Texture2D::sub_image is unimplemented"); + const Texture2D &self = *static_cast(this); + + VkImageCreateInfo *image_info = static_cast(ii); + image_info->imageType = VK_IMAGE_TYPE_2D; + image_info->extent.width = self.width; + image_info->extent.height = self.height; + image_info->mipLevels = self.levels; +} + +void VulkanTexture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, const void *data) +{ + const Texture2D &self = *static_cast(this); + + auto level_size = self.get_level_size(level); + synchronize(-1, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, (x==0 && y==0 && wd==level_size.x && ht==level_size.y)); + + size_t data_size = wd*ht*get_pixel_size(storage_fmt); + void *staging = device.get_transfer_queue().prepare_transfer(data_size, + [this, level, x, y, wd, ht](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.mipLevel = level; + region.imageSubresource.baseArrayLayer = 0; + 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); + }); + + const char *src = static_cast(data); + copy(src, src+data_size, static_cast(staging)); } Resource::AsyncLoader *VulkanTexture2D::load(IO::Seekable &, const Resources *) diff --git a/source/backends/vulkan/texture2d_backend.h b/source/backends/vulkan/texture2d_backend.h index a0b22314..1a5377ed 100644 --- a/source/backends/vulkan/texture2d_backend.h +++ b/source/backends/vulkan/texture2d_backend.h @@ -11,6 +11,7 @@ class VulkanTexture2D: public Texture protected: VulkanTexture2D(); + virtual void fill_image_info(void *) const; void sub_image(unsigned, int, int, unsigned, unsigned, const void *); public: diff --git a/source/backends/vulkan/texture2darray_backend.cpp b/source/backends/vulkan/texture2darray_backend.cpp index 3c0239db..cff3a816 100644 --- a/source/backends/vulkan/texture2darray_backend.cpp +++ b/source/backends/vulkan/texture2darray_backend.cpp @@ -8,5 +8,15 @@ VulkanTexture2DArray::VulkanTexture2DArray(): Texture3D(VK_IMAGE_VIEW_TYPE_2D_ARRAY) { } +void VulkanTexture2DArray::fill_image_info(void *ii) const +{ + VkImageCreateInfo *image_info = static_cast(ii); + image_info->imageType = VK_IMAGE_TYPE_2D; + image_info->extent.width = width; + image_info->extent.height = height; + image_info->mipLevels = levels; + image_info->arrayLayers = depth; +} + } // namespace GL } // namespace Msp diff --git a/source/backends/vulkan/texture2darray_backend.h b/source/backends/vulkan/texture2darray_backend.h index 2f5a608a..39db1f5c 100644 --- a/source/backends/vulkan/texture2darray_backend.h +++ b/source/backends/vulkan/texture2darray_backend.h @@ -10,6 +10,8 @@ class VulkanTexture2DArray: public Texture3D { protected: VulkanTexture2DArray(); + + virtual void fill_image_info(void *) const; }; using Texture2DArrayBackend = VulkanTexture2DArray; diff --git a/source/backends/vulkan/texture2dmultisample_backend.cpp b/source/backends/vulkan/texture2dmultisample_backend.cpp index e45e7cbb..4a81273b 100644 --- a/source/backends/vulkan/texture2dmultisample_backend.cpp +++ b/source/backends/vulkan/texture2dmultisample_backend.cpp @@ -1,3 +1,5 @@ +#include "frameformat.h" +#include "texture2dmultisample.h" #include "texture2dmultisample_backend.h" #include "vulkan.h" @@ -10,6 +12,17 @@ VulkanTexture2DMultisample::VulkanTexture2DMultisample(): throw std::logic_error("VulkanTexture2DMultisample is unimplemented"); } +void VulkanTexture2DMultisample::fill_image_info(void *ii) const +{ + const Texture2DMultisample &self = *static_cast(this); + + VkImageCreateInfo *image_info = static_cast(ii); + image_info->imageType = VK_IMAGE_TYPE_2D; + image_info->extent.width = self.width; + image_info->extent.height = self.height; + image_info->samples = static_cast(get_vulkan_samples(self.samples)); +} + size_t VulkanTexture2DMultisample::get_data_size() const { return 0; diff --git a/source/backends/vulkan/texture2dmultisample_backend.h b/source/backends/vulkan/texture2dmultisample_backend.h index cfb45a5d..d20e33bc 100644 --- a/source/backends/vulkan/texture2dmultisample_backend.h +++ b/source/backends/vulkan/texture2dmultisample_backend.h @@ -11,6 +11,8 @@ class VulkanTexture2DMultisample: public Texture protected: VulkanTexture2DMultisample(); + virtual void fill_image_info(void *) const; + public: virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; } virtual std::size_t get_data_size() const; diff --git a/source/backends/vulkan/texture3d_backend.cpp b/source/backends/vulkan/texture3d_backend.cpp index 26e55e5a..7a11b35e 100644 --- a/source/backends/vulkan/texture3d_backend.cpp +++ b/source/backends/vulkan/texture3d_backend.cpp @@ -1,21 +1,59 @@ +#include "device.h" +#include "texture3d.h" #include "texture3d_backend.h" #include "vulkan.h" +using namespace std; + namespace Msp { namespace GL { VulkanTexture3D::VulkanTexture3D(): Texture(VK_IMAGE_VIEW_TYPE_3D) -{ - throw std::logic_error("VulkanTexture3D is unimplemented"); -} +{ } VulkanTexture3D::VulkanTexture3D(unsigned t): Texture(t) { } -void VulkanTexture3D::sub_image(unsigned, int, int, int, unsigned, unsigned, unsigned, const void *) +void VulkanTexture3D::fill_image_info(void *ii) const +{ + const Texture3D &self = *static_cast(this); + + VkImageCreateInfo *image_info = static_cast(ii); + image_info->imageType = VK_IMAGE_TYPE_3D; + 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(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)); + + 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(); + + VkBufferImageCopy region = { }; + region.bufferOffset = src_off; + region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + 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); + }); + + const char *src = static_cast(data); + copy(src, src+data_size, static_cast(staging)); } bool VulkanTexture3D::is_array() const diff --git a/source/backends/vulkan/texture3d_backend.h b/source/backends/vulkan/texture3d_backend.h index 5a113ea0..c5bdeb57 100644 --- a/source/backends/vulkan/texture3d_backend.h +++ b/source/backends/vulkan/texture3d_backend.h @@ -12,6 +12,7 @@ protected: VulkanTexture3D(); VulkanTexture3D(unsigned); + virtual void fill_image_info(void *) const; void sub_image(unsigned, int, int, int, unsigned, unsigned, unsigned, const void *); bool is_array() const; diff --git a/source/backends/vulkan/texture_backend.cpp b/source/backends/vulkan/texture_backend.cpp index ff1afad9..06c4a622 100644 --- a/source/backends/vulkan/texture_backend.cpp +++ b/source/backends/vulkan/texture_backend.cpp @@ -1,5 +1,6 @@ #include "device.h" #include "error.h" +#include "synchronizer.h" #include "texture.h" #include "texture_backend.h" #include "vulkan.h" @@ -18,17 +19,23 @@ VulkanTexture::VulkanTexture(VulkanTexture &&other): device(other.device), handle(other.handle), view_handle(other.view_handle), + memory_id(other.memory_id), view_type(other.view_type), debug_name(move(other.debug_name)) { other.handle = 0; other.view_handle = 0; + other.memory_id = 0; } VulkanTexture::~VulkanTexture() { + DestroyQueue &dq = device.get_destroy_queue(); + if(view_handle) - device.get_destroy_queue().destroy(view_handle); + dq.destroy(view_handle); + if(handle) + dq.destroy(handle, memory_id); } void VulkanTexture::allocate() @@ -36,14 +43,44 @@ void VulkanTexture::allocate() const Texture &self = *static_cast(this); const VulkanFunctions &vk = device.get_functions(); + VkImageCreateInfo image_info = { }; + image_info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; + image_info.format = static_cast(get_vulkan_pixelformat(self.storage_fmt)); + image_info.extent.width = 1; + image_info.extent.height = 1; + image_info.extent.depth = 1; + image_info.mipLevels = 1; + image_info.arrayLayers = 1; + image_info.samples = VK_SAMPLE_COUNT_1_BIT; + image_info.tiling = VK_IMAGE_TILING_OPTIMAL; + image_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE; + image_info.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; + + image_info.usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT; + PixelComponents comp = get_components(self.storage_fmt); + if(comp==DEPTH_COMPONENT || comp==STENCIL_INDEX) + image_info.usage |= VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT; + else + image_info.usage |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + + fill_image_info(&image_info); + + /* SwapChainTexture may have already provided the image. Create_info is + filled anyway because some of its fields are used for view_info. */ if(!handle) - throw logic_error("Texture image allocation is unimplemented"); + { + vk.CreateImage(image_info, handle); + memory_id = device.get_allocator().allocate(handle, DEVICE_MEMORY); + + // Trigger a layout transition if the image is used before uploading data. + synchronize(-1, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, true); + } VkImageViewCreateInfo view_info = { }; view_info.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO; view_info.image = handle_cast<::VkImage>(handle); view_info.viewType = static_cast(view_type); - view_info.format = static_cast(get_vulkan_pixelformat(self.storage_fmt)); + view_info.format = image_info.format; const unsigned *swizzle_order = get_vulkan_swizzle(self.swizzle); view_info.components.r = static_cast(swizzle_order[0]); @@ -53,9 +90,9 @@ void VulkanTexture::allocate() view_info.subresourceRange.aspectMask = get_vulkan_aspect(get_components(self.storage_fmt)); view_info.subresourceRange.baseMipLevel = 0; - view_info.subresourceRange.levelCount = 1; + view_info.subresourceRange.levelCount = image_info.mipLevels; view_info.subresourceRange.baseArrayLayer = 0; - view_info.subresourceRange.layerCount = 1; + view_info.subresourceRange.layerCount = image_info.arrayLayers; vk.CreateImageView(view_info, view_handle); @@ -68,6 +105,12 @@ void VulkanTexture::generate_mipmap() throw logic_error("VulkanTexture::generate_mipmap is unimplemented"); } +void VulkanTexture::synchronize(int layer, unsigned layout, bool discard) const +{ + unsigned aspect = get_vulkan_aspect(get_components(static_cast(this)->storage_fmt)); + device.get_synchronizer().access(handle, aspect, layer, layout, discard); +} + void VulkanTexture::set_debug_name(const string &name) { #ifdef DEBUG @@ -84,9 +127,14 @@ void VulkanTexture::set_vulkan_object_names() const #ifdef DEBUG const VulkanFunctions &vk = device.get_functions(); - string view_name = debug_name+"/view"; VkDebugUtilsObjectNameInfoEXT name_info = { }; name_info.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT; + name_info.objectType = VK_OBJECT_TYPE_IMAGE; + name_info.objectHandle = reinterpret_cast(handle); + name_info.pObjectName = debug_name.c_str(); + vk.SetDebugUtilsObjectName(name_info); + + string view_name = debug_name+"/view"; name_info.objectType = VK_OBJECT_TYPE_IMAGE_VIEW; name_info.objectHandle = reinterpret_cast(view_handle); name_info.pObjectName = view_name.c_str(); diff --git a/source/backends/vulkan/texture_backend.h b/source/backends/vulkan/texture_backend.h index 1744cdd8..4784ae9a 100644 --- a/source/backends/vulkan/texture_backend.h +++ b/source/backends/vulkan/texture_backend.h @@ -18,6 +18,7 @@ protected: Device &device; VkImage handle = 0; VkImageView view_handle = 0; + unsigned memory_id = 0; unsigned view_type; std::string debug_name; @@ -26,10 +27,13 @@ protected: ~VulkanTexture(); void allocate(); + virtual void fill_image_info(void *) const = 0; void require_swizzle() { } void generate_mipmap(); + void synchronize(int, unsigned, bool = false) const; + void set_debug_name(const std::string &); void set_vulkan_object_names() const; }; diff --git a/source/backends/vulkan/texturecube_backend.cpp b/source/backends/vulkan/texturecube_backend.cpp index 77a8b3d3..fe528921 100644 --- a/source/backends/vulkan/texturecube_backend.cpp +++ b/source/backends/vulkan/texturecube_backend.cpp @@ -1,3 +1,5 @@ +#include "device.h" +#include "texturecube.h" #include "texturecube_backend.h" #include "vulkan.h" @@ -8,12 +10,46 @@ namespace GL { VulkanTextureCube::VulkanTextureCube(): Texture(VK_IMAGE_VIEW_TYPE_CUBE) +{ } + +void VulkanTextureCube::fill_image_info(void *ii) const { - throw std::logic_error("VulkanTextureCube is unimplemented"); + const TextureCube &self = *static_cast(this); + + VkImageCreateInfo *image_info = static_cast(ii); + image_info->flags |= VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT; + 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; } -void VulkanTextureCube::sub_image(unsigned, unsigned, int, int, unsigned, unsigned, const void *) +void VulkanTextureCube::sub_image(unsigned face, unsigned level, int x, int y, unsigned wd, unsigned ht, const void *data) { + const TextureCube &self = *static_cast(this); + + unsigned level_size = self.get_level_size(level); + synchronize(face, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, (x==0 && y==0 && wd==level_size && ht==level_size)); + + size_t data_size = wd*ht*get_pixel_size(storage_fmt); + void *staging = device.get_transfer_queue().prepare_transfer(data_size, + [this, face, level, x, y, wd, ht](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.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); + }); + + const char *src = static_cast(data); + copy(src, src+data_size, static_cast(staging)); } size_t VulkanTextureCube::get_data_size() const diff --git a/source/backends/vulkan/texturecube_backend.h b/source/backends/vulkan/texturecube_backend.h index 071130d9..2e8d936f 100644 --- a/source/backends/vulkan/texturecube_backend.h +++ b/source/backends/vulkan/texturecube_backend.h @@ -11,6 +11,7 @@ class VulkanTextureCube: public Texture protected: VulkanTextureCube(); + virtual void fill_image_info(void *) const; void sub_image(unsigned, unsigned, int, int, unsigned, unsigned, const void *); public: diff --git a/source/backends/vulkan/vulkan.cpp b/source/backends/vulkan/vulkan.cpp index fd6b992f..b4033af9 100644 --- a/source/backends/vulkan/vulkan.cpp +++ b/source/backends/vulkan/vulkan.cpp @@ -52,10 +52,17 @@ VulkanFunctions::VulkanFunctions(const Graphics::VulkanContext &c): // 12 vkCreateBuffer(context.get_function("vkCreateBuffer")), vkDestroyBuffer(context.get_function("vkDestroyBuffer")), + vkCreateImage(context.get_function("vkCreateImage")), + vkDestroyImage(context.get_function("vkDestroyImage")), vkCreateImageView(context.get_function("vkCreateImageView")), vkDestroyImageView(context.get_function("vkDestroyImageView")), vkGetBufferMemoryRequirements(context.get_function("vkGetBufferMemoryRequirements")), + vkGetImageMemoryRequirements(context.get_function("vkGetImageMemoryRequirements")), vkBindBufferMemory(context.get_function("vkBindBufferMemory")), + vkBindImageMemory(context.get_function("vkBindImageMemory")), + // 13 + vkCreateSampler(context.get_function("vkCreateSampler")), + vkDestroySampler(context.get_function("vkDestroySampler")), // 14 vkCreateDescriptorSetLayout(context.get_function("vkCreateDescriptorSetLayout")), vkDestroyDescriptorSetLayout(context.get_function("vkDestroyDescriptorSetLayout")), @@ -69,6 +76,7 @@ VulkanFunctions::VulkanFunctions(const Graphics::VulkanContext &c): vkCmdPushConstants(context.get_function("vkCmdPushConstants")), // 19 vkCmdCopyBuffer(context.get_function("vkCmdCopyBuffer")), + vkCmdCopyBufferToImage(context.get_function("vkCmdCopyBufferToImage")), // 20 vkCmdBindIndexBuffer(context.get_function("vkCmdBindIndexBuffer")), vkCmdDrawIndexed(context.get_function("vkCmdDrawIndexed")), diff --git a/source/backends/vulkan/vulkan.h b/source/backends/vulkan/vulkan.h index 373b75ae..b4b084bd 100644 --- a/source/backends/vulkan/vulkan.h +++ b/source/backends/vulkan/vulkan.h @@ -133,10 +133,16 @@ private: PFN_vkUnmapMemory vkUnmapMemory = 0; // 11.2.9 PFN_vkCreateBuffer vkCreateBuffer = 0; // 12.1 PFN_vkDestroyBuffer vkDestroyBuffer = 0; // 12.1 + PFN_vkCreateImage vkCreateImage = 0; // 12.3 + PFN_vkDestroyImage vkDestroyImage = 0; // 12.3 PFN_vkCreateImageView vkCreateImageView = 0; // 12.5 PFN_vkDestroyImageView vkDestroyImageView = 0; // 12.5 PFN_vkGetBufferMemoryRequirements vkGetBufferMemoryRequirements = 0; // 12.7 + PFN_vkGetImageMemoryRequirements vkGetImageMemoryRequirements = 0; // 12.7 PFN_vkBindBufferMemory vkBindBufferMemory = 0; // 12.7 + PFN_vkBindImageMemory vkBindImageMemory = 0; // 12.7 + PFN_vkCreateSampler vkCreateSampler = 0; // 13 + PFN_vkDestroySampler vkDestroySampler = 0; // 13 PFN_vkCreateDescriptorSetLayout vkCreateDescriptorSetLayout = 0; // 14.2.1 PFN_vkDestroyDescriptorSetLayout vkDestroyDescriptorSetLayout = 0; // 14.2.1 PFN_vkCreatePipelineLayout vkCreatePipelineLayout = 0; // 14.2.2 @@ -148,6 +154,7 @@ private: PFN_vkCmdBindDescriptorSets vkCmdBindDescriptorSets = 0; // 14.2.7 PFN_vkCmdPushConstants vkCmdPushConstants = 0; // 14.2.10 PFN_vkCmdCopyBuffer vkCmdCopyBuffer = 0; // 19.2 + PFN_vkCmdCopyBufferToImage vkCmdCopyBufferToImage = 0; // 19.4 PFN_vkCmdBindIndexBuffer vkCmdBindIndexBuffer = 0; // 20.3 PFN_vkCmdDrawIndexed vkCmdDrawIndexed = 0; // 20.3 PFN_vkCmdBindVertexBuffers vkCmdBindVertexBuffers = 0; // 21.2 @@ -280,6 +287,12 @@ public: void DestroyBuffer(VkBuffer image) const { vkDestroyBuffer(device, handle_cast<::VkBuffer>(image), 0); } + Result CreateImage(const VkImageCreateInfo &rCreateInfo, VkImage &rImage) const + { return { vkCreateImage(device, &rCreateInfo, 0, handle_cast<::VkImage *>(&rImage)), "vkCreateImage" }; } + + void DestroyImage(VkImage image) const + { vkDestroyImage(device, handle_cast<::VkImage>(image), 0); } + Result CreateImageView(const VkImageViewCreateInfo &rCreateInfo, VkImageView &rView) const { return { vkCreateImageView(device, &rCreateInfo, 0, handle_cast<::VkImageView *>(&rView)), "vkCreateImageView" }; } @@ -289,9 +302,22 @@ public: void GetBufferMemoryRequirements(VkBuffer image, VkMemoryRequirements &rMemoryRequirements) const { vkGetBufferMemoryRequirements(device, handle_cast<::VkBuffer>(image), &rMemoryRequirements); } + void GetImageMemoryRequirements(VkImage image, VkMemoryRequirements &rMemoryRequirements) const + { vkGetImageMemoryRequirements(device, handle_cast<::VkImage>(image), &rMemoryRequirements); } + Result BindBufferMemory(VkBuffer image, VkDeviceMemory memory, VkDeviceSize memoryOffset) const { return { vkBindBufferMemory(device, handle_cast<::VkBuffer>(image), handle_cast<::VkDeviceMemory>(memory), memoryOffset), "vkBindBufferMemory" }; } + Result BindImageMemory(VkImage image, VkDeviceMemory memory, VkDeviceSize memoryOffset) const + { return { vkBindImageMemory(device, handle_cast<::VkImage>(image), handle_cast<::VkDeviceMemory>(memory), memoryOffset), "vkBindImageMemory" }; } + + // Chapter 13: Samplers + Result CreateSampler(const VkSamplerCreateInfo &rCreateInfo, VkSampler &rSampler) const + { return { vkCreateSampler(device, &rCreateInfo, 0, handle_cast<::VkSampler *>(&rSampler)), "vkCreateSampler" }; } + + void DestroySampler(VkSampler sampler) const + { vkDestroySampler(device, handle_cast<::VkSampler>(sampler), 0); } + // Chapter 14: Resource Descriptors Result CreateDescriptorSetLayout(const VkDescriptorSetLayoutCreateInfo &rCreateInfo, VkDescriptorSetLayout &rSetLayout) const { return { vkCreateDescriptorSetLayout(device, &rCreateInfo, 0, handle_cast<::VkDescriptorSetLayout *>(&rSetLayout)), "vkCreateDescriptorSetLayout" }; } @@ -327,6 +353,9 @@ public: void CmdCopyBuffer(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, std::uint32_t regionCount, const VkBufferCopy *pRegions) const { vkCmdCopyBuffer(handle_cast<::VkCommandBuffer>(commandBuffer), handle_cast<::VkBuffer>(srcBuffer), handle_cast<::VkBuffer>(dstBuffer), regionCount, pRegions); } + void CmdCopyBufferToImage(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkImage dstImage, VkImageLayout dstImageLayout, std::uint32_t regionCount, const VkBufferImageCopy *pRegions) const + { vkCmdCopyBufferToImage(handle_cast<::VkCommandBuffer>(commandBuffer), handle_cast<::VkBuffer>(srcBuffer), handle_cast<::VkImage>(dstImage), dstImageLayout, regionCount, pRegions); } + // Chapter 20: Drawing Commands void CmdBindIndexBuffer(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType) const { vkCmdBindIndexBuffer(handle_cast<::VkCommandBuffer>(commandBuffer), handle_cast<::VkBuffer>(buffer), offset, indexType); } -- 2.43.0