mirror/vk-bootstrap
1
0
Fork 0
mirror of https://github.com/charles-lunarg/vk-bootstrap.git synced 2024-11-22 07:24:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass Image Usage flags into Swapchain

Browse Source 
This allows the image views to be created with the same usage flags as
the swapchain. This necessitated passing in version information down
the object creation chain because to add the usage flags requires 1.1
to be enabled.
This commit is contained in:
Charles Giessen 2022-10-07 12:15:59 -06:00 committed by Charles Giessen
parent 14e5a557f7
commit 01de71738c
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/VkBootstrap.cpp
View File

@ -1558,6 +1558,7 @@ Result<Device> DeviceBuilder::build() const {
device.fp_vkGetDeviceProcAddr = detail::vulkan_functions().fp_vkGetDeviceProcAddr; device.fp_vkGetDeviceProcAddr = detail::vulkan_functions().fp_vkGetDeviceProcAddr;
detail::vulkan_functions().get_device_proc_addr(device.device, device.internal_table.fp_vkGetDeviceQueue, "vkGetDeviceQueue"); detail::vulkan_functions().get_device_proc_addr(device.device, device.internal_table.fp_vkGetDeviceQueue, "vkGetDeviceQueue");
detail::vulkan_functions().get_device_proc_addr(device.device, device.internal_table.fp_vkDestroyDevice, "vkDestroyDevice"); detail::vulkan_functions().get_device_proc_addr(device.device, device.internal_table.fp_vkDestroyDevice, "vkDestroyDevice");
device.instance_version = physical_device.instance_version;
return device; return device;
} }
DeviceBuilder& DeviceBuilder::custom_queue_setup(std::vector<CustomQueueDescription> queue_descriptions) { DeviceBuilder& DeviceBuilder::custom_queue_setup(std::vector<CustomQueueDescription> queue_descriptions) {
@ -1689,9 +1690,10 @@ void destroy_swapchain(Swapchain const& swapchain) {
} }
SwapchainBuilder::SwapchainBuilder(Device const& device) { SwapchainBuilder::SwapchainBuilder(Device const& device) {
info.device = device.device;
info.physical_device = device.physical_device.physical_device; info.physical_device = device.physical_device.physical_device;
info.device = device.device;
info.surface = device.surface; info.surface = device.surface;
info.instance_version = device.instance_version;
auto present = device.get_queue_index(QueueType::present); auto present = device.get_queue_index(QueueType::present);
auto graphics = device.get_queue_index(QueueType::graphics); auto graphics = device.get_queue_index(QueueType::graphics);
assert(graphics.has_value() && present.has_value() && "Graphics and Present queue indexes must be valid"); assert(graphics.has_value() && present.has_value() && "Graphics and Present queue indexes must be valid");
@ -1700,9 +1702,10 @@ SwapchainBuilder::SwapchainBuilder(Device const& device) {
info.allocation_callbacks = device.allocation_callbacks; info.allocation_callbacks = device.allocation_callbacks;
} }
SwapchainBuilder::SwapchainBuilder(Device const& device, VkSurfaceKHR const surface) { SwapchainBuilder::SwapchainBuilder(Device const& device, VkSurfaceKHR const surface) {
info.device = device.device;
info.physical_device = device.physical_device.physical_device; info.physical_device = device.physical_device.physical_device;
info.device = device.device;
info.surface = surface; info.surface = surface;
info.instance_version = device.instance_version;
Device temp_device = device; Device temp_device = device;
temp_device.surface = surface; temp_device.surface = surface;
auto present = temp_device.get_queue_index(QueueType::present); auto present = temp_device.get_queue_index(QueueType::present);
@ -1824,6 +1827,7 @@ Result<Swapchain> SwapchainBuilder::build() const {
swapchain.device = info.device; swapchain.device = info.device;
swapchain.image_format = surface_format.format; swapchain.image_format = surface_format.format;
swapchain.color_space = surface_format.colorSpace; swapchain.color_space = surface_format.colorSpace;
swapchain.image_usage_flags = info.image_usage_flags;
swapchain.extent = extent; swapchain.extent = extent;
detail::vulkan_functions().get_device_proc_addr( detail::vulkan_functions().get_device_proc_addr(
info.device, swapchain.internal_table.fp_vkGetSwapchainImagesKHR, "vkGetSwapchainImagesKHR"); info.device, swapchain.internal_table.fp_vkGetSwapchainImagesKHR, "vkGetSwapchainImagesKHR");
@ -1838,6 +1842,7 @@ Result<Swapchain> SwapchainBuilder::build() const {
swapchain.requested_min_image_count = image_count; swapchain.requested_min_image_count = image_count;
swapchain.present_mode = present_mode; swapchain.present_mode = present_mode;
swapchain.image_count = static_cast<uint32_t>(images.value().size()); swapchain.image_count = static_cast<uint32_t>(images.value().size());
swapchain.instance_version = info.instance_version;
swapchain.allocation_callbacks = info.allocation_callbacks; swapchain.allocation_callbacks = info.allocation_callbacks;
return swapchain; return swapchain;
} }
@ -1857,12 +1862,33 @@ Result<std::vector<VkImageView>> Swapchain::get_image_views(const void* pNext) {
if (!swapchain_images_ret) return swapchain_images_ret.error(); if (!swapchain_images_ret) return swapchain_images_ret.error();
const auto swapchain_images = swapchain_images_ret.value(); const auto swapchain_images = swapchain_images_ret.value();
#if defined(VK_VERSION_1_1)
bool already_contains_image_view_usage = false;
while (pNext) {
if (reinterpret_cast<const VkBaseInStructure*>(pNext)->sType == VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO) {
already_contains_image_view_usage = true;
break;
}
pNext = reinterpret_cast<const VkBaseInStructure*>(pNext)->pNext;
}
VkImageViewUsageCreateInfo desired_flags{};
desired_flags.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO;
desired_flags.pNext = pNext;
desired_flags.usage = image_usage_flags;
#endif
std::vector<VkImageView> views(swapchain_images.size()); std::vector<VkImageView> views(swapchain_images.size());
for (size_t i = 0; i < swapchain_images.size(); i++) { for (size_t i = 0; i < swapchain_images.size(); i++) {
VkImageViewCreateInfo createInfo = {}; VkImageViewCreateInfo createInfo = {};
createInfo.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO; createInfo.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
#if defined(VK_VERSION_1_1)
if (instance_version >= VKB_VK_API_VERSION_1_1 && !already_contains_image_view_usage) {
createInfo.pNext = &desired_flags;
} else {
createInfo.pNext = pNext;
}
#else
createInfo.pNext = pNext; createInfo.pNext = pNext;
#endif
createInfo.image = swapchain_images[i]; createInfo.image = swapchain_images[i];
createInfo.viewType = VK_IMAGE_VIEW_TYPE_2D; createInfo.viewType = VK_IMAGE_VIEW_TYPE_2D;
createInfo.format = image_format; createInfo.format = image_format;

7
src/VkBootstrap.h
View File

@ -686,6 +686,7 @@ struct Device {
std::vector<VkQueueFamilyProperties> queue_families; std::vector<VkQueueFamilyProperties> queue_families;
VkAllocationCallbacks* allocation_callbacks = VK_NULL_HANDLE; VkAllocationCallbacks* allocation_callbacks = VK_NULL_HANDLE;
PFN_vkGetDeviceProcAddr fp_vkGetDeviceProcAddr = nullptr; PFN_vkGetDeviceProcAddr fp_vkGetDeviceProcAddr = nullptr;
uint32_t instance_version = VKB_VK_API_VERSION_1_0;
Result<uint32_t> get_queue_index(QueueType type) const; Result<uint32_t> get_queue_index(QueueType type) const;
// Only a compute or transfer queue type is valid. All other queue types do not support a 'dedicated' queue index // Only a compute or transfer queue type is valid. All other queue types do not support a 'dedicated' queue index
@ -759,9 +760,12 @@ struct Swapchain {
uint32_t image_count = 0; uint32_t image_count = 0;
VkFormat image_format = VK_FORMAT_UNDEFINED; // The image format actually used when creating the swapchain. VkFormat image_format = VK_FORMAT_UNDEFINED; // The image format actually used when creating the swapchain.
VkColorSpaceKHR color_space = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR; // The color space actually used when creating the swapchain. VkColorSpaceKHR color_space = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR; // The color space actually used when creating the swapchain.
VkImageUsageFlags image_usage_flags = 0;
VkExtent2D extent = { 0, 0 }; VkExtent2D extent = { 0, 0 };
uint32_t requested_min_image_count = 0; // The value of minImageCount actually used when creating the swapchain; note that the presentation engine is always free to create more images than that. // The value of minImageCount actually used when creating the swapchain; note that the presentation engine is always free to create more images than that.
uint32_t requested_min_image_count = 0;
VkPresentModeKHR present_mode = VK_PRESENT_MODE_IMMEDIATE_KHR; // The present mode actually used when creating the swapchain. VkPresentModeKHR present_mode = VK_PRESENT_MODE_IMMEDIATE_KHR; // The present mode actually used when creating the swapchain.
uint32_t instance_version = VKB_VK_API_VERSION_1_0;
VkAllocationCallbacks* allocation_callbacks = VK_NULL_HANDLE; VkAllocationCallbacks* allocation_callbacks = VK_NULL_HANDLE;
// Returns a vector of VkImage handles to the swapchain. // Returns a vector of VkImage handles to the swapchain.
@ -909,6 +913,7 @@ class SwapchainBuilder {
VkSwapchainCreateFlagBitsKHR create_flags = static_cast<VkSwapchainCreateFlagBitsKHR>(0); VkSwapchainCreateFlagBitsKHR create_flags = static_cast<VkSwapchainCreateFlagBitsKHR>(0);
VkSurfaceKHR surface = VK_NULL_HANDLE; VkSurfaceKHR surface = VK_NULL_HANDLE;
std::vector<VkSurfaceFormatKHR> desired_formats; std::vector<VkSurfaceFormatKHR> desired_formats;
uint32_t instance_version = VKB_VK_API_VERSION_1_0;
uint32_t desired_width = 256; uint32_t desired_width = 256;
uint32_t desired_height = 256; uint32_t desired_height = 256;
uint32_t array_layer_count = 1; uint32_t array_layer_count = 1;