nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-25 16:24:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

hal/vk: use Option::insert() with push_next for adapter features

Browse Source
This commit is contained in:
Dzmitry Malyshau 2021-11-29 11:46:47 -05:00
parent e81844dda1
commit f0d41d1561
1 changed files with 42 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
wgpu-hal/src/vulkan/adapter.rs
View File

@ -3,7 +3,7 @@ use super::conv;
use ash::{extensions::khr, vk}; use ash::{extensions::khr, vk};
use parking_lot::Mutex; use parking_lot::Mutex;
use std::{ffi::CStr, mem, ptr, sync::Arc}; use std::{ffi::CStr, sync::Arc};
//TODO: const fn? //TODO: const fn?
fn indexing_features() -> wgt::Features { fn indexing_features() -> wgt::Features {
@ -657,29 +657,28 @@ impl super::InstanceShared {
capabilities.properties = if let Some(ref get_device_properties) = capabilities.properties = if let Some(ref get_device_properties) =
self.get_physical_device_properties self.get_physical_device_properties
{ {
// Get this now to avoid borrowing conflicts later
let supports_descriptor_indexing =
capabilities.supports_extension(vk::ExtDescriptorIndexingFn::name());
let core = vk::PhysicalDeviceProperties::builder().build(); let core = vk::PhysicalDeviceProperties::builder().build();
let mut properites2 = vk::PhysicalDeviceProperties2::builder() let mut builder = vk::PhysicalDeviceProperties2::builder().properties(core);
.properties(core)
.build();
if capabilities.properties.api_version >= vk::API_VERSION_1_2 { if capabilities.properties.api_version >= vk::API_VERSION_1_2 {
capabilities.vulkan_1_2 = let next = capabilities
Some(vk::PhysicalDeviceVulkan12Properties::builder().build()); .vulkan_1_2
.insert(vk::PhysicalDeviceVulkan12Properties::builder().build());
let mut_ref = capabilities.vulkan_1_2.as_mut().unwrap(); builder = builder.push_next(next);
mut_ref.p_next =
mem::replace(&mut properites2.p_next, mut_ref as *mut _ as *mut _);
} }
if capabilities.supports_extension(vk::ExtDescriptorIndexingFn::name()) { if supports_descriptor_indexing {
capabilities.descriptor_indexing = let next = capabilities.descriptor_indexing.insert(
Some(vk::PhysicalDeviceDescriptorIndexingPropertiesEXT::builder().build()); vk::PhysicalDeviceDescriptorIndexingPropertiesEXT::builder().build(),
);
let mut_ref = capabilities.descriptor_indexing.as_mut().unwrap(); builder = builder.push_next(next);
mut_ref.p_next =
mem::replace(&mut properites2.p_next, mut_ref as *mut _ as *mut _);
} }
let mut properites2 = builder.build();
unsafe { unsafe {
get_device_properties.get_physical_device_properties2(phd, &mut properites2); get_device_properties.get_physical_device_properties2(phd, &mut properites2);
} }
@ -695,58 +694,52 @@ impl super::InstanceShared {
features.core = if let Some(ref get_device_properties) = self.get_physical_device_properties features.core = if let Some(ref get_device_properties) = self.get_physical_device_properties
{ {
let core = vk::PhysicalDeviceFeatures::builder().build(); let core = vk::PhysicalDeviceFeatures::builder().build();
let mut features2 = vk::PhysicalDeviceFeatures2KHR::builder() let mut builder = vk::PhysicalDeviceFeatures2KHR::builder().features(core);
.features(core)
.build();
if capabilities.properties.api_version >= vk::API_VERSION_1_2 { if capabilities.properties.api_version >= vk::API_VERSION_1_2 {
features.vulkan_1_2 = Some(vk::PhysicalDeviceVulkan12Features::builder().build()); let next = features
.vulkan_1_2
let mut_ref = features.vulkan_1_2.as_mut().unwrap(); .insert(vk::PhysicalDeviceVulkan12Features::builder().build());
mut_ref.p_next = mem::replace(&mut features2.p_next, mut_ref as *mut _ as *mut _); builder = builder.push_next(next);
} }
if capabilities.supports_extension(vk::ExtDescriptorIndexingFn::name()) { if capabilities.supports_extension(vk::ExtDescriptorIndexingFn::name()) {
features.descriptor_indexing = let next = features
Some(vk::PhysicalDeviceDescriptorIndexingFeaturesEXT::builder().build()); .descriptor_indexing
.insert(vk::PhysicalDeviceDescriptorIndexingFeaturesEXT::builder().build());
let mut_ref = features.descriptor_indexing.as_mut().unwrap(); builder = builder.push_next(next);
mut_ref.p_next = mem::replace(&mut features2.p_next, mut_ref as *mut _ as *mut _);
} }
// `VK_KHR_imageless_framebuffer` is promoted to 1.2, but has no changes, so we can keep using the extension unconditionally. // `VK_KHR_imageless_framebuffer` is promoted to 1.2, but has no changes, so we can keep using the extension unconditionally.
if capabilities.supports_extension(vk::KhrImagelessFramebufferFn::name()) { if capabilities.supports_extension(vk::KhrImagelessFramebufferFn::name()) {
features.imageless_framebuffer = let next = features
Some(vk::PhysicalDeviceImagelessFramebufferFeaturesKHR::builder().build()); .imageless_framebuffer
.insert(vk::PhysicalDeviceImagelessFramebufferFeaturesKHR::builder().build());
let mut_ref = features.imageless_framebuffer.as_mut().unwrap(); builder = builder.push_next(next);
mut_ref.p_next = mem::replace(&mut features2.p_next, mut_ref as *mut _ as *mut _);
} }
// `VK_KHR_timeline_semaphore` is promoted to 1.2, but has no changes, so we can keep using the extension unconditionally. // `VK_KHR_timeline_semaphore` is promoted to 1.2, but has no changes, so we can keep using the extension unconditionally.
if capabilities.supports_extension(vk::KhrTimelineSemaphoreFn::name()) { if capabilities.supports_extension(vk::KhrTimelineSemaphoreFn::name()) {
features.timeline_semaphore = let next = features
Some(vk::PhysicalDeviceTimelineSemaphoreFeaturesKHR::builder().build()); .timeline_semaphore
.insert(vk::PhysicalDeviceTimelineSemaphoreFeaturesKHR::builder().build());
let mut_ref = features.timeline_semaphore.as_mut().unwrap(); builder = builder.push_next(next);
mut_ref.p_next = mem::replace(&mut features2.p_next, mut_ref as *mut _ as *mut _);
} }
if capabilities.supports_extension(vk::ExtImageRobustnessFn::name()) { if capabilities.supports_extension(vk::ExtImageRobustnessFn::name()) {
features.image_robustness = let next = features
Some(vk::PhysicalDeviceImageRobustnessFeaturesEXT::builder().build()); .image_robustness
.insert(vk::PhysicalDeviceImageRobustnessFeaturesEXT::builder().build());
let mut_ref = features.image_robustness.as_mut().unwrap(); builder = builder.push_next(next);
mut_ref.p_next = mem::replace(&mut features2.p_next, mut_ref as *mut _ as *mut _);
} }
if capabilities.supports_extension(vk::ExtRobustness2Fn::name()) { if capabilities.supports_extension(vk::ExtRobustness2Fn::name()) {
features.robustness2 = let next = features
Some(vk::PhysicalDeviceRobustness2FeaturesEXT::builder().build()); .robustness2
.insert(vk::PhysicalDeviceRobustness2FeaturesEXT::builder().build());
let mut_ref = features.robustness2.as_mut().unwrap(); builder = builder.push_next(next);
mut_ref.p_next = mem::replace(&mut features2.p_next, mut_ref as *mut _ as *mut _);
} }
let mut features2 = builder.build();
unsafe { unsafe {
get_device_properties.get_physical_device_features2(phd, &mut features2); get_device_properties.get_physical_device_features2(phd, &mut features2);
} }
@ -755,24 +748,6 @@ impl super::InstanceShared {
unsafe { self.raw.get_physical_device_features(phd) } unsafe { self.raw.get_physical_device_features(phd) }
}; };
/// # Safety
/// `T` must be a struct bigger than `vk::BaseOutStructure`.
unsafe fn null_p_next<T>(features: &mut Option<T>) {
if let Some(ref mut features) = *features {
// This is technically invalid since `vk::BaseOutStructure` and `T` will probably never have the same size.
(*(features as *mut T as *mut vk::BaseOutStructure)).p_next = ptr::null_mut();
}
}
unsafe {
null_p_next(&mut features.vulkan_1_2);
null_p_next(&mut features.descriptor_indexing);
null_p_next(&mut features.imageless_framebuffer);
null_p_next(&mut features.timeline_semaphore);
null_p_next(&mut features.image_robustness);
null_p_next(&mut features.robustness2);
}
(capabilities, features) (capabilities, features)
} }
} }