From b67f4913e2418ae6678d8b8b2ae868cac78b19ba Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Fri, 11 Aug 2023 15:35:48 -0700 Subject: [PATCH] [vk] Don't request portability enumeration without the extension. VUID-VkInstanceCreateInfo-flags-06559 forbids us from passing `vk::InstanceCreateFlags::ENUMERATE_PORTABILITY_KHR` unless we actually found and requested the "VK_KHR_portability_enumeration" extension. Fixes #4004. --- CHANGELOG.md | 2 ++ wgpu-hal/src/vulkan/instance.rs | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8514eb4c52b..adf16f14e7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -77,6 +77,8 @@ By @Valaphee in [#3402](https://github.com/gfx-rs/wgpu/pull/3402) #### Vulkan - Fix enabling `wgpu::Features::PARTIALLY_BOUND_BINDING_ARRAY` not being actually enabled in vulkan backend. By @39ali in[#3772](https://github.com/gfx-rs/wgpu/pull/3772). +- Don't pass `vk::InstanceCreateFlags::ENUMERATE_PORTABILITY_KHR` unless the `VK_KHR_portability_enumeration` extension is available. By @jimblandy in[#4038](https://github.com/gfx-rs/wgpu/pull/4038). + ## v0.17.0 (2023-07-20) This is the first release that featured `wgpu-info` as a binary crate for getting information about what devices wgpu sees in your system. It can dump the information in both human readable format and json. diff --git a/wgpu-hal/src/vulkan/instance.rs b/wgpu-hal/src/vulkan/instance.rs index 5e07cd7794d..31b6a1b1179 100644 --- a/wgpu-hal/src/vulkan/instance.rs +++ b/wgpu-hal/src/vulkan/instance.rs @@ -589,6 +589,11 @@ impl crate::Instance for super::Instance { let extensions = Self::required_extensions(&entry, driver_api_version, desc.flags)?; + let portability_enumeration_extension = + CStr::from_bytes_with_nul(b"VK_KHR_portability_enumeration\0").unwrap(); + let has_portability_enumeration_extension = + extensions.contains(&portability_enumeration_extension); + let instance_layers = entry.enumerate_instance_layer_properties().map_err(|e| { log::info!("enumerate_instance_layer_properties: {:?}", e); crate::InstanceError @@ -657,6 +662,14 @@ impl crate::Instance for super::Instance { #[cfg(not(target_os = "android"))] let android_sdk_version = 0; + // Avoid VUID-VkInstanceCreateInfo-flags-06559: Only ask the instance to + // enumerate incomplete Vulkan implementations (which we need on Mac) if + // we managed to find the extension that provides the flag. + let mut flags = vk::InstanceCreateFlags::empty(); + if has_portability_enumeration_extension { + flags |= vk::InstanceCreateFlags::ENUMERATE_PORTABILITY_KHR; + } + let vk_instance = { let str_pointers = layers .iter() @@ -668,7 +681,7 @@ impl crate::Instance for super::Instance { .collect::>(); let create_info = vk::InstanceCreateInfo::builder() - .flags(vk::InstanceCreateFlags::ENUMERATE_PORTABILITY_KHR) + .flags(flags) .application_info(&app_info) .enabled_layer_names(&str_pointers[..layers.len()]) .enabled_extension_names(&str_pointers[layers.len()..]);