Skip to content

Commit 7d81ec8

Browse files
MarijnS95EriKWDev
authored andcommitted
[wgpu-hal] Upgrade to ash 0.38 (gfx-rs#5504)
1 parent 07caf59 commit 7d81ec8

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

wgpu-hal/src/vulkan/adapter.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1443,6 +1443,9 @@ impl super::Instance {
14431443
}),
14441444
image_format_list: phd_capabilities.device_api_version >= vk::API_VERSION_1_2
14451445
|| phd_capabilities.supports_extension(khr::image_format_list::NAME),
1446+
subgroup_size_control: phd_features
1447+
.subgroup_size_control
1448+
.map_or(false, |ext| ext.subgroup_size_control == vk::TRUE),
14461449
};
14471450
let capabilities = crate::Capabilities {
14481451
limits: phd_capabilities.to_wgpu_limits(),

wgpu-hal/src/vulkan/device.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,8 @@ impl super::Device {
772772
};
773773

774774
let mut flags = vk::PipelineShaderStageCreateFlags::empty();
775-
if self.shared.features.contains(wgt::Features::SUBGROUP) {
775+
// if self.shared.features.contains(wgt::Features::SUBGROUP) {
776+
if self.shared.private_caps.subgroup_size_control {
776777
flags |= vk::PipelineShaderStageCreateFlags::ALLOW_VARYING_SUBGROUP_SIZE
777778
}
778779

wgpu-hal/src/vulkan/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,7 @@ struct PrivateCapabilities {
347347
robust_image_access2: bool,
348348
zero_initialize_workgroup_memory: bool,
349349
image_format_list: bool,
350+
subgroup_size_control: bool,
350351
}
351352

352353
bitflags::bitflags!(
@@ -924,6 +925,7 @@ impl crate::Queue for Queue {
924925
signal_semaphores.push(raw);
925926
signal_values.push(signal_value);
926927
}
928+
927929
Fence::FencePool {
928930
ref mut active,
929931
ref mut free,

0 commit comments

Comments
 (0)