diff options
| author | 2021-08-29 01:52:09 -0400 | |
|---|---|---|
| committer | 2021-08-29 02:03:36 -0400 | |
| commit | 27f8f3333f8e87e87c7b7dfebdc466bb96ab0a48 (patch) | |
| tree | 3c4d2b8e421252c5f674606d9d9ab372b1552ee8 /src/video_core/renderer_vulkan | |
| parent | vk_swapchain: Prefer linear swapchain format when presenting sRGB images (diff) | |
| download | yuzu-27f8f3333f8e87e87c7b7dfebdc466bb96ab0a48.tar.gz yuzu-27f8f3333f8e87e87c7b7dfebdc466bb96ab0a48.tar.xz yuzu-27f8f3333f8e87e87c7b7dfebdc466bb96ab0a48.zip | |
vulkan_device: Enable VK_KHR_swapchain_mutable_format if available
Silences validation errors when creating sRGB image views of linear swapchain images
Diffstat (limited to 'src/video_core/renderer_vulkan')
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_swapchain.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/video_core/renderer_vulkan/vk_swapchain.cpp b/src/video_core/renderer_vulkan/vk_swapchain.cpp index d0a731660..e5318e52d 100644 --- a/src/video_core/renderer_vulkan/vk_swapchain.cpp +++ b/src/video_core/renderer_vulkan/vk_swapchain.cpp | |||
| @@ -179,6 +179,17 @@ void VKSwapchain::CreateSwapchain(const VkSurfaceCapabilitiesKHR& capabilities, | |||
| 179 | swapchain_ci.queueFamilyIndexCount = static_cast<u32>(queue_indices.size()); | 179 | swapchain_ci.queueFamilyIndexCount = static_cast<u32>(queue_indices.size()); |
| 180 | swapchain_ci.pQueueFamilyIndices = queue_indices.data(); | 180 | swapchain_ci.pQueueFamilyIndices = queue_indices.data(); |
| 181 | } | 181 | } |
| 182 | static constexpr std::array view_formats{VK_FORMAT_B8G8R8A8_UNORM, VK_FORMAT_B8G8R8A8_SRGB}; | ||
| 183 | VkImageFormatListCreateInfo format_list{ | ||
| 184 | .sType = VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO_KHR, | ||
| 185 | .pNext = nullptr, | ||
| 186 | .viewFormatCount = static_cast<u32>(view_formats.size()), | ||
| 187 | .pViewFormats = view_formats.data(), | ||
| 188 | }; | ||
| 189 | if (device.IsKhrSwapchainMutableFormatEnabled()) { | ||
| 190 | format_list.pNext = std::exchange(swapchain_ci.pNext, &format_list); | ||
| 191 | swapchain_ci.flags |= VK_SWAPCHAIN_CREATE_MUTABLE_FORMAT_BIT_KHR; | ||
| 192 | } | ||
| 182 | // Request the size again to reduce the possibility of a TOCTOU race condition. | 193 | // Request the size again to reduce the possibility of a TOCTOU race condition. |
| 183 | const auto updated_capabilities = physical_device.GetSurfaceCapabilitiesKHR(surface); | 194 | const auto updated_capabilities = physical_device.GetSurfaceCapabilitiesKHR(surface); |
| 184 | swapchain_ci.imageExtent = ChooseSwapExtent(updated_capabilities, width, height); | 195 | swapchain_ci.imageExtent = ChooseSwapExtent(updated_capabilities, width, height); |