Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better way to handle vk khr portability enumeration extension #4044

Merged
merged 3 commits into from
Aug 15, 2023
Merged

Better way to handle vk khr portability enumeration extension #4044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fd920c
improved PR#4038 by using ash's definition instead
hybcloud Aug 13, 2023
fe251f8
Merge branch 'trunk' into better_way_to_handle_VK_KHR_portability_enu…
hybcloud Aug 13, 2023
ec2ffab
Merge branch 'trunk' into better_way_to_handle_VK_KHR_portability_enu…
hybcloud Aug 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ By @Valaphee in [#3402](https://github.com/gfx-rs/wgpu/pull/3402)

- 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).

- Enhancement of [#4038], using ash's definition instead of hard-coded c_str. By @hybcloud in[#4044](https://github.com/gfx-rs/wgpu/pull/4044).

#### DX12

- DX12 doesn't support `Features::POLYGON_MODE_POINT``. By @teoxoy in [#4032](https://github.com/gfx-rs/wgpu/pull/4032).
Expand Down
10 changes: 2 additions & 8 deletions wgpu-hal/src/vulkan/instance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,7 @@ impl super::Instance {
if cfg!(target_os = "macos") {
// VK_EXT_metal_surface
extensions.push(ext::MetalSurface::name());
extensions
.push(CStr::from_bytes_with_nul(b"VK_KHR_portability_enumeration\0").unwrap());
extensions.push(ash::vk::KhrPortabilityEnumerationFn::name());
}

if flags.contains(crate::InstanceFlags::DEBUG) {
Expand Down Expand Up @@ -589,11 +588,6 @@ impl crate::Instance<super::Api> 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
Expand Down Expand Up @@ -667,7 +661,7 @@ impl crate::Instance<super::Api> for super::Instance {
// 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.
if has_portability_enumeration_extension {
if extensions.contains(&ash::vk::KhrPortabilityEnumerationFn::name()) {
flags |= vk::InstanceCreateFlags::ENUMERATE_PORTABILITY_KHR;
}

Expand Down