github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

hal/vk: fix vulkan-1.2 caps check, again

Browse Source
This commit is contained in:
Dzmitry Malyshau
2021-11-30 13:34:02 -05:00
parent 20e1d4d170
commit 09bea3c5f0
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -735,17 +735,17 @@ impl super::InstanceShared {
// we only have the `VkInstance` version but not `VkPhysicalDevice` one.
let vk12_next = capabilities
.vulkan_1_2
.insert(vk::PhysicalDeviceVulkan12Properties::builder().build());
.insert(vk::PhysicalDeviceVulkan12Properties::default());
let core = vk::PhysicalDeviceProperties::builder().build();
let core = vk::PhysicalDeviceProperties::default();
let mut builder = vk::PhysicalDeviceProperties2::builder()
.properties(core)
.push_next(vk12_next);
if supports_descriptor_indexing {
let next = capabilities.descriptor_indexing.insert(
vk::PhysicalDeviceDescriptorIndexingPropertiesEXT::builder().build(),
);
let next = capabilities
.descriptor_indexing
.insert(vk::PhysicalDeviceDescriptorIndexingPropertiesEXT::default());
builder = builder.push_next(next);
}
@@ -754,7 +754,7 @@ impl super::InstanceShared {
get_device_properties.get_physical_device_properties2(phd, &mut properites2);
}
// clean up Vk1.2 stuff if not supported
if capabilities.properties.api_version < vk::API_VERSION_1_2 {
if properites2.properties.api_version < vk::API_VERSION_1_2 {
capabilities.vulkan_1_2 = None;
}
properites2.properties
@@ -768,27 +768,27 @@ impl super::InstanceShared {
let mut features = PhysicalDeviceFeatures::default();
features.core = if let Some(ref get_device_properties) = self.get_physical_device_properties
{
let core = vk::PhysicalDeviceFeatures::builder().build();
let core = vk::PhysicalDeviceFeatures::default();
let mut builder = vk::PhysicalDeviceFeatures2KHR::builder().features(core);
if capabilities.properties.api_version >= vk::API_VERSION_1_1 {
let next = features
.vulkan_1_1
.insert(vk::PhysicalDeviceVulkan11Features::builder().build());
.insert(vk::PhysicalDeviceVulkan11Features::default());
builder = builder.push_next(next);
}
if capabilities.properties.api_version >= vk::API_VERSION_1_2 {
let next = features
.vulkan_1_2
.insert(vk::PhysicalDeviceVulkan12Features::builder().build());
.insert(vk::PhysicalDeviceVulkan12Features::default());
builder = builder.push_next(next);
}
if capabilities.supports_extension(vk::ExtDescriptorIndexingFn::name()) {
let next = features
.descriptor_indexing
.insert(vk::PhysicalDeviceDescriptorIndexingFeaturesEXT::builder().build());
.insert(vk::PhysicalDeviceDescriptorIndexingFeaturesEXT::default());
builder = builder.push_next(next);
}
@@ -796,7 +796,7 @@ impl super::InstanceShared {
if capabilities.supports_extension(vk::KhrImagelessFramebufferFn::name()) {
let next = features
.imageless_framebuffer
.insert(vk::PhysicalDeviceImagelessFramebufferFeaturesKHR::builder().build());
.insert(vk::PhysicalDeviceImagelessFramebufferFeaturesKHR::default());
builder = builder.push_next(next);
}
@@ -804,26 +804,26 @@ impl super::InstanceShared {
if capabilities.supports_extension(vk::KhrTimelineSemaphoreFn::name()) {
let next = features
.timeline_semaphore
.insert(vk::PhysicalDeviceTimelineSemaphoreFeaturesKHR::builder().build());
.insert(vk::PhysicalDeviceTimelineSemaphoreFeaturesKHR::default());
builder = builder.push_next(next);
}
if capabilities.supports_extension(vk::ExtImageRobustnessFn::name()) {
let next = features
.image_robustness
.insert(vk::PhysicalDeviceImageRobustnessFeaturesEXT::builder().build());
.insert(vk::PhysicalDeviceImageRobustnessFeaturesEXT::default());
builder = builder.push_next(next);
}
if capabilities.supports_extension(vk::ExtRobustness2Fn::name()) {
let next = features
.robustness2
.insert(vk::PhysicalDeviceRobustness2FeaturesEXT::builder().build());
.insert(vk::PhysicalDeviceRobustness2FeaturesEXT::default());
builder = builder.push_next(next);
}
if capabilities.supports_extension(vk::ExtDepthClipEnableFn::name()) {
let next = features
.depth_clip_enable
.insert(vk::PhysicalDeviceDepthClipEnableFeaturesEXT::builder().build());
.insert(vk::PhysicalDeviceDepthClipEnableFeaturesEXT::default());
builder = builder.push_next(next);
}