Slendi/lunar
1
0
Fork 0
mirror of https://github.com/slendidev/lunar.git synced 2025-12-14 19:49:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move to C++ vulkan API

Browse Source 
Signed-off-by: Slendi <slendi@socopon.com>
This commit is contained in:
Slendi
2025-12-11 22:46:55 +02:00
parent c856e0414c
commit 054a196b13
7 changed files with 619 additions and 679 deletions
Download Patch File Download Diff File Expand all files Collapse all files

224
src/Util.cpp
View File

@@ -4,140 +4,110 @@
namespace vkutil {
auto transition_image(VkCommandBuffer cmd, VkImage image,
VkImageLayout current_layout, VkImageLayout new_layout) -> void
auto transition_image(vk::CommandBuffer cmd, vk::Image image,
vk::ImageLayout current_layout, vk::ImageLayout new_layout) -> void
{
VkImageAspectFlags aspect_mask
= (new_layout == VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL)
? VK_IMAGE_ASPECT_DEPTH_BIT
: VK_IMAGE_ASPECT_COLOR_BIT;
auto aspect_mask = (new_layout == vk::ImageLayout::eDepthAttachmentOptimal)
? vk::ImageAspectFlagBits::eDepth
: vk::ImageAspectFlagBits::eColor;
VkImageMemoryBarrier image_barrier {
.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
.pNext = nullptr,
vk::ImageMemoryBarrier image_barrier {};
image_barrier.srcAccessMask = vk::AccessFlagBits::eMemoryWrite;
image_barrier.dstAccessMask
= vk::AccessFlagBits::eMemoryWrite | vk::AccessFlagBits::eMemoryRead;
image_barrier.oldLayout = current_layout;
image_barrier.newLayout = new_layout;
image_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
image_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
image_barrier.image = image;
image_barrier.subresourceRange.aspectMask = aspect_mask;
image_barrier.subresourceRange.baseMipLevel = 0;
image_barrier.subresourceRange.levelCount = 1;
image_barrier.subresourceRange.baseArrayLayer = 0;
image_barrier.subresourceRange.layerCount = 1;
.srcAccessMask = VK_ACCESS_MEMORY_WRITE_BIT,
.dstAccessMask
= VK_ACCESS_MEMORY_WRITE_BIT | VK_ACCESS_MEMORY_READ_BIT,
.oldLayout = current_layout,
.newLayout = new_layout,
.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
.image = image,
.subresourceRange = {
.aspectMask = aspect_mask,
.baseMipLevel = 0,
.levelCount = 1,
.baseArrayLayer = 0,
.layerCount = 1,
},
};
vkCmdPipelineBarrier(cmd, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, 0, nullptr, 0, nullptr, 1,
&image_barrier);
cmd.pipelineBarrier(vk::PipelineStageFlagBits::eAllCommands,
vk::PipelineStageFlagBits::eAllCommands, {}, {}, {}, image_barrier);
}
auto copy_image_to_image(VkCommandBuffer cmd, VkImage source,
VkImage destination, VkExtent2D src_size, VkExtent2D dst_size) -> void
auto copy_image_to_image(vk::CommandBuffer cmd, vk::Image source,
vk::Image destination, vk::Extent2D src_size, vk::Extent2D dst_size) -> void
{
VkImageBlit2 blit_region {};
blit_region.sType = VK_STRUCTURE_TYPE_IMAGE_BLIT_2;
blit_region.pNext = nullptr;
vk::ImageBlit2 blit_region {};
blit_region.srcOffsets[0] = vk::Offset3D { 0, 0, 0 };
blit_region.srcOffsets[1]
= vk::Offset3D { static_cast<int32_t>(src_size.width),
static_cast<int32_t>(src_size.height), 1 };
blit_region.srcOffsets[0] = { 0, 0, 0 };
blit_region.srcOffsets[1] = { static_cast<int32_t>(src_size.width),
static_cast<int32_t>(src_size.height), 1 };
blit_region.dstOffsets[0] = vk::Offset3D { 0, 0, 0 };
blit_region.dstOffsets[1]
= vk::Offset3D { static_cast<int32_t>(dst_size.width),
static_cast<int32_t>(dst_size.height), 1 };
blit_region.dstOffsets[0] = { 0, 0, 0 };
blit_region.dstOffsets[1] = { static_cast<int32_t>(dst_size.width),
static_cast<int32_t>(dst_size.height), 1 };
blit_region.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
blit_region.srcSubresource.aspectMask = vk::ImageAspectFlagBits::eColor;
blit_region.srcSubresource.baseArrayLayer = 0;
blit_region.srcSubresource.layerCount = 1;
blit_region.srcSubresource.mipLevel = 0;
blit_region.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
blit_region.dstSubresource.aspectMask = vk::ImageAspectFlagBits::eColor;
blit_region.dstSubresource.baseArrayLayer = 0;
blit_region.dstSubresource.layerCount = 1;
blit_region.dstSubresource.mipLevel = 0;
VkBlitImageInfo2 blit_info {};
blit_info.sType = VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2;
blit_info.pNext = nullptr;
vk::BlitImageInfo2 blit_info {};
blit_info.dstImage = destination;
blit_info.dstImageLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
blit_info.dstImageLayout = vk::ImageLayout::eTransferDstOptimal;
blit_info.srcImage = source;
blit_info.srcImageLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
blit_info.filter = VK_FILTER_LINEAR;
blit_info.srcImageLayout = vk::ImageLayout::eTransferSrcOptimal;
blit_info.filter = vk::Filter::eLinear;
blit_info.regionCount = 1;
blit_info.pRegions = &blit_region;
vkCmdBlitImage2(cmd, &blit_info);
cmd.blitImage2(blit_info);
}
auto load_shader_module(std::span<uint8_t> spirv_data, VkDevice device,
VkShaderModule *out_shader_module) -> bool
auto load_shader_module(std::span<uint8_t> spirv_data, vk::Device device)
-> vk::UniqueShaderModule
{
if (!device || !out_shader_module)
return false;
if (!device || spirv_data.empty() || (spirv_data.size() % 4) != 0) {
return {};
}
if (spirv_data.empty() || (spirv_data.size() % 4) != 0)
return false;
VkShaderModuleCreateInfo create_info {};
create_info.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO;
create_info.pNext = nullptr;
create_info.flags = 0;
vk::ShaderModuleCreateInfo create_info {};
create_info.codeSize = spirv_data.size();
create_info.pCode = reinterpret_cast<uint32_t const *>(spirv_data.data());
VkResult const res = vkCreateShaderModule(
device, &create_info, nullptr, out_shader_module);
if (res != VK_SUCCESS) {
*out_shader_module = VK_NULL_HANDLE;
return false;
try {
return device.createShaderModuleUnique(create_info);
} catch (vk::SystemError const &) {
return {};
}
return true;
}
} // namespace vkutil
namespace vkinit {
auto image_create_info(VkFormat format, VkImageUsageFlags usage_flags,
VkExtent3D extent) -> VkImageCreateInfo
auto image_create_info(vk::Format format, vk::ImageUsageFlags usage_flags,
vk::Extent3D extent) -> vk::ImageCreateInfo
{
VkImageCreateInfo info = {};
info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
info.pNext = nullptr;
info.imageType = VK_IMAGE_TYPE_2D;
vk::ImageCreateInfo info {};
info.imageType = vk::ImageType::e2D;
info.format = format;
info.extent = extent;
info.mipLevels = 1;
info.arrayLayers = 1;
info.samples = VK_SAMPLE_COUNT_1_BIT;
info.tiling = VK_IMAGE_TILING_OPTIMAL;
info.samples = vk::SampleCountFlagBits::e1;
info.tiling = vk::ImageTiling::eOptimal;
info.usage = usage_flags;
return info;
}
auto imageview_create_info(VkFormat format, VkImage image,
VkImageAspectFlags aspect_flags) -> VkImageViewCreateInfo
auto imageview_create_info(vk::Format format, vk::Image image,
vk::ImageAspectFlags aspect_flags) -> vk::ImageViewCreateInfo
{
VkImageViewCreateInfo info = {};
info.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
info.pNext = nullptr;
info.viewType = VK_IMAGE_VIEW_TYPE_2D;
vk::ImageViewCreateInfo info {};
info.viewType = vk::ImageViewType::e2D;
info.image = image;
info.format = format;
info.subresourceRange.baseMipLevel = 0;
@@ -145,27 +115,22 @@ auto imageview_create_info(VkFormat format, VkImage image,
info.subresourceRange.baseArrayLayer = 0;
info.subresourceRange.layerCount = 1;
info.subresourceRange.aspectMask = aspect_flags;
return info;
}
auto command_buffer_submit_info(VkCommandBuffer cmd)
-> VkCommandBufferSubmitInfo
auto command_buffer_submit_info(vk::CommandBuffer cmd)
-> vk::CommandBufferSubmitInfo
{
VkCommandBufferSubmitInfo info {};
info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_SUBMIT_INFO;
info.pNext = nullptr;
vk::CommandBufferSubmitInfo info {};
info.commandBuffer = cmd;
info.deviceMask = 0;
return info;
}
auto semaphore_submit_info(VkPipelineStageFlags2 stage_mask,
VkSemaphore semaphore) -> VkSemaphoreSubmitInfo
auto semaphore_submit_info(vk::PipelineStageFlags2 stage_mask,
vk::Semaphore semaphore) -> vk::SemaphoreSubmitInfo
{
VkSemaphoreSubmitInfo info {};
info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO;
info.pNext = nullptr;
vk::SemaphoreSubmitInfo info {};
info.semaphore = semaphore;
info.value = 0;
info.stageMask = stage_mask;
@@ -173,14 +138,11 @@ auto semaphore_submit_info(VkPipelineStageFlags2 stage_mask,
return info;
}
auto submit_info2(VkCommandBufferSubmitInfo *cmd_info,
VkSemaphoreSubmitInfo *wait_semaphore_info,
VkSemaphoreSubmitInfo *signal_semaphore_info) -> VkSubmitInfo2
auto submit_info2(vk::CommandBufferSubmitInfo *cmd_info,
vk::SemaphoreSubmitInfo *wait_semaphore_info,
vk::SemaphoreSubmitInfo *signal_semaphore_info) -> vk::SubmitInfo2
{
VkSubmitInfo2 info {};
info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO_2;
info.pNext = nullptr;
info.flags = 0;
vk::SubmitInfo2 info {};
info.waitSemaphoreInfoCount = wait_semaphore_info ? 1u : 0u;
info.pWaitSemaphoreInfos = wait_semaphore_info;
info.commandBufferInfoCount = cmd_info ? 1u : 0u;
@@ -190,18 +152,15 @@ auto submit_info2(VkCommandBufferSubmitInfo *cmd_info,
return info;
}
auto attachment_info(VkImageView view, VkClearValue *clear,
VkImageLayout layout) -> VkRenderingAttachmentInfo
auto attachment_info(vk::ImageView view, vk::ClearValue *clear,
vk::ImageLayout layout) -> vk::RenderingAttachmentInfo
{
VkRenderingAttachmentInfo color_at {};
color_at.sType = VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO;
color_at.pNext = nullptr;
vk::RenderingAttachmentInfo color_at {};
color_at.imageView = view;
color_at.imageLayout = layout;
color_at.loadOp
= clear ? VK_ATTACHMENT_LOAD_OP_CLEAR : VK_ATTACHMENT_LOAD_OP_LOAD;
color_at.storeOp = VK_ATTACHMENT_STORE_OP_STORE;
= clear ? vk::AttachmentLoadOp::eClear : vk::AttachmentLoadOp::eLoad;
color_at.storeOp = vk::AttachmentStoreOp::eStore;
if (clear) {
color_at.clearValue = *clear;
}
@@ -209,27 +168,22 @@ auto attachment_info(VkImageView view, VkClearValue *clear,
return color_at;
}
auto pipeline_shader_stage(VkShaderStageFlagBits stage, VkShaderModule module)
-> VkPipelineShaderStageCreateInfo
auto pipeline_shader_stage(vk::ShaderStageFlagBits stage,
vk::ShaderModule module) -> vk::PipelineShaderStageCreateInfo
{
VkPipelineShaderStageCreateInfo stage_ci {};
stage_ci.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
stage_ci.pNext = nullptr;
vk::PipelineShaderStageCreateInfo stage_ci {};
stage_ci.stage = stage;
stage_ci.module = module;
stage_ci.pName = "main";
return stage_ci;
}
auto render_info(VkExtent2D extent, VkRenderingAttachmentInfo const *color_att,
VkRenderingAttachmentInfo const *depth_att) -> VkRenderingInfo
auto render_info(vk::Extent2D extent,
vk::RenderingAttachmentInfo const *color_att,
vk::RenderingAttachmentInfo const *depth_att) -> vk::RenderingInfo
{
VkRenderingInfo render_info {};
render_info.sType = VK_STRUCTURE_TYPE_RENDERING_INFO;
render_info.pNext = nullptr;
render_info.flags = 0;
render_info.renderArea = { {}, extent };
vk::RenderingInfo render_info {};
render_info.renderArea = vk::Rect2D { {}, extent };
render_info.layerCount = 1;
render_info.colorAttachmentCount = color_att ? 1 : 0;
render_info.pColorAttachments = color_att;
@@ -237,19 +191,15 @@ auto render_info(VkExtent2D extent, VkRenderingAttachmentInfo const *color_att,
return render_info;
}
auto depth_attachment_info(VkImageView view, VkImageLayout layout)
-> VkRenderingAttachmentInfo
auto depth_attachment_info(vk::ImageView view, vk::ImageLayout layout)
-> vk::RenderingAttachmentInfo
{
VkRenderingAttachmentInfo depth_att {};
depth_att.sType = VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO;
depth_att.pNext = nullptr;
vk::RenderingAttachmentInfo depth_att {};
depth_att.imageView = view;
depth_att.imageLayout = layout;
depth_att.loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
depth_att.storeOp = VK_ATTACHMENT_STORE_OP_STORE;
depth_att.loadOp = vk::AttachmentLoadOp::eClear;
depth_att.storeOp = vk::AttachmentStoreOp::eStore;
depth_att.clearValue.depthStencil.depth = 1.f;
return depth_att;
}