vulkan_device: Enable VK_KHR_swapchain_mutable_format if available
Silences validation errors when creating sRGB image views of linear swapchain images
This commit is contained in:
parent
3c65c8580f
commit
27f8f3333f
|
@ -179,6 +179,17 @@ void VKSwapchain::CreateSwapchain(const VkSurfaceCapabilitiesKHR& capabilities,
|
||||||
swapchain_ci.queueFamilyIndexCount = static_cast<u32>(queue_indices.size());
|
swapchain_ci.queueFamilyIndexCount = static_cast<u32>(queue_indices.size());
|
||||||
swapchain_ci.pQueueFamilyIndices = queue_indices.data();
|
swapchain_ci.pQueueFamilyIndices = queue_indices.data();
|
||||||
}
|
}
|
||||||
|
static constexpr std::array view_formats{VK_FORMAT_B8G8R8A8_UNORM, VK_FORMAT_B8G8R8A8_SRGB};
|
||||||
|
VkImageFormatListCreateInfo format_list{
|
||||||
|
.sType = VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO_KHR,
|
||||||
|
.pNext = nullptr,
|
||||||
|
.viewFormatCount = static_cast<u32>(view_formats.size()),
|
||||||
|
.pViewFormats = view_formats.data(),
|
||||||
|
};
|
||||||
|
if (device.IsKhrSwapchainMutableFormatEnabled()) {
|
||||||
|
format_list.pNext = std::exchange(swapchain_ci.pNext, &format_list);
|
||||||
|
swapchain_ci.flags |= VK_SWAPCHAIN_CREATE_MUTABLE_FORMAT_BIT_KHR;
|
||||||
|
}
|
||||||
// Request the size again to reduce the possibility of a TOCTOU race condition.
|
// Request the size again to reduce the possibility of a TOCTOU race condition.
|
||||||
const auto updated_capabilities = physical_device.GetSurfaceCapabilitiesKHR(surface);
|
const auto updated_capabilities = physical_device.GetSurfaceCapabilitiesKHR(surface);
|
||||||
swapchain_ci.imageExtent = ChooseSwapExtent(updated_capabilities, width, height);
|
swapchain_ci.imageExtent = ChooseSwapExtent(updated_capabilities, width, height);
|
||||||
|
|
|
@ -839,6 +839,8 @@ std::vector<const char*> Device::LoadExtensions(bool requires_surface) {
|
||||||
bool has_khr_shader_float16_int8{};
|
bool has_khr_shader_float16_int8{};
|
||||||
bool has_khr_workgroup_memory_explicit_layout{};
|
bool has_khr_workgroup_memory_explicit_layout{};
|
||||||
bool has_khr_pipeline_executable_properties{};
|
bool has_khr_pipeline_executable_properties{};
|
||||||
|
bool has_khr_image_format_list{};
|
||||||
|
bool has_khr_swapchain_mutable_format{};
|
||||||
bool has_ext_subgroup_size_control{};
|
bool has_ext_subgroup_size_control{};
|
||||||
bool has_ext_transform_feedback{};
|
bool has_ext_transform_feedback{};
|
||||||
bool has_ext_custom_border_color{};
|
bool has_ext_custom_border_color{};
|
||||||
|
@ -888,6 +890,9 @@ std::vector<const char*> Device::LoadExtensions(bool requires_surface) {
|
||||||
test(has_ext_shader_atomic_int64, VK_KHR_SHADER_ATOMIC_INT64_EXTENSION_NAME, false);
|
test(has_ext_shader_atomic_int64, VK_KHR_SHADER_ATOMIC_INT64_EXTENSION_NAME, false);
|
||||||
test(has_khr_workgroup_memory_explicit_layout,
|
test(has_khr_workgroup_memory_explicit_layout,
|
||||||
VK_KHR_WORKGROUP_MEMORY_EXPLICIT_LAYOUT_EXTENSION_NAME, false);
|
VK_KHR_WORKGROUP_MEMORY_EXPLICIT_LAYOUT_EXTENSION_NAME, false);
|
||||||
|
test(has_khr_image_format_list, VK_KHR_IMAGE_FORMAT_LIST_EXTENSION_NAME, false);
|
||||||
|
test(has_khr_swapchain_mutable_format, VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_EXTENSION_NAME,
|
||||||
|
false);
|
||||||
test(has_ext_line_rasterization, VK_EXT_LINE_RASTERIZATION_EXTENSION_NAME, false);
|
test(has_ext_line_rasterization, VK_EXT_LINE_RASTERIZATION_EXTENSION_NAME, false);
|
||||||
if (Settings::values.enable_nsight_aftermath) {
|
if (Settings::values.enable_nsight_aftermath) {
|
||||||
test(nv_device_diagnostics_config, VK_NV_DEVICE_DIAGNOSTICS_CONFIG_EXTENSION_NAME,
|
test(nv_device_diagnostics_config, VK_NV_DEVICE_DIAGNOSTICS_CONFIG_EXTENSION_NAME,
|
||||||
|
@ -1066,6 +1071,11 @@ std::vector<const char*> Device::LoadExtensions(bool requires_surface) {
|
||||||
khr_pipeline_executable_properties = true;
|
khr_pipeline_executable_properties = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (has_khr_image_format_list && has_khr_swapchain_mutable_format) {
|
||||||
|
extensions.push_back(VK_KHR_IMAGE_FORMAT_LIST_EXTENSION_NAME);
|
||||||
|
extensions.push_back(VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_EXTENSION_NAME);
|
||||||
|
khr_swapchain_mutable_format = true;
|
||||||
|
}
|
||||||
if (khr_push_descriptor) {
|
if (khr_push_descriptor) {
|
||||||
VkPhysicalDevicePushDescriptorPropertiesKHR push_descriptor;
|
VkPhysicalDevicePushDescriptorPropertiesKHR push_descriptor;
|
||||||
push_descriptor.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR;
|
push_descriptor.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR;
|
||||||
|
|
|
@ -224,6 +224,11 @@ public:
|
||||||
return khr_pipeline_executable_properties;
|
return khr_pipeline_executable_properties;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Returns true if VK_KHR_swapchain_mutable_format is enabled.
|
||||||
|
bool IsKhrSwapchainMutableFormatEnabled() const {
|
||||||
|
return khr_swapchain_mutable_format;
|
||||||
|
}
|
||||||
|
|
||||||
/// Returns true if the device supports VK_KHR_workgroup_memory_explicit_layout.
|
/// Returns true if the device supports VK_KHR_workgroup_memory_explicit_layout.
|
||||||
bool IsKhrWorkgroupMemoryExplicitLayoutSupported() const {
|
bool IsKhrWorkgroupMemoryExplicitLayoutSupported() const {
|
||||||
return khr_workgroup_memory_explicit_layout;
|
return khr_workgroup_memory_explicit_layout;
|
||||||
|
@ -390,6 +395,7 @@ private:
|
||||||
bool khr_workgroup_memory_explicit_layout{}; ///< Support for explicit workgroup layouts.
|
bool khr_workgroup_memory_explicit_layout{}; ///< Support for explicit workgroup layouts.
|
||||||
bool khr_push_descriptor{}; ///< Support for VK_KHR_push_descritor.
|
bool khr_push_descriptor{}; ///< Support for VK_KHR_push_descritor.
|
||||||
bool khr_pipeline_executable_properties{}; ///< Support for executable properties.
|
bool khr_pipeline_executable_properties{}; ///< Support for executable properties.
|
||||||
|
bool khr_swapchain_mutable_format{}; ///< Support for VK_KHR_swapchain_mutable_format.
|
||||||
bool ext_index_type_uint8{}; ///< Support for VK_EXT_index_type_uint8.
|
bool ext_index_type_uint8{}; ///< Support for VK_EXT_index_type_uint8.
|
||||||
bool ext_sampler_filter_minmax{}; ///< Support for VK_EXT_sampler_filter_minmax.
|
bool ext_sampler_filter_minmax{}; ///< Support for VK_EXT_sampler_filter_minmax.
|
||||||
bool ext_depth_range_unrestricted{}; ///< Support for VK_EXT_depth_range_unrestricted.
|
bool ext_depth_range_unrestricted{}; ///< Support for VK_EXT_depth_range_unrestricted.
|
||||||
|
|
Reference in New Issue