mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-21 15:00:57 +01:00
Fix Subgroup Ops on VK 1.2 Device (#5624)
This commit is contained in:
1 parent
093204169b
commit
c81ac937e1
4 files changed
+8
-8
No files matched your search
+5
-3
@@ -37,9 +37,7 @@ Bottom level categories:
|
||||
- Hal
|
||||
-->
|
||||
|
||||
## Unreleased
|
||||
|
||||
## v0.20.1 (2024-04-??)
|
||||
## Unreleased -- v0.20.1 (2024-04-??)
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
@@ -47,6 +45,10 @@ Bottom level categories:
|
||||
|
||||
- Clean up weak references to texture views and bind groups. By @xiaopengli89 [#5595](https://github.com/gfx-rs/wgpu/pull/5595).
|
||||
|
||||
#### Vulkan
|
||||
|
||||
- Fix enablement of subgroup ops extension on Vulkan devices that don't support Vulkan 1.3. By @cwfitzgerald in [#5624](https://github.com/gfx-rs/wgpu/pull/5624).
|
||||
|
||||
|
||||
## v0.20.0 (2024-04-28)
|
||||
|
||||
|
||||
@@ -1485,9 +1485,6 @@ impl super::Instance {
|
||||
}),
|
||||
image_format_list: phd_capabilities.device_api_version >= vk::API_VERSION_1_2
|
||||
|| phd_capabilities.supports_extension(vk::KhrImageFormatListFn::name()),
|
||||
subgroup_size_control: phd_features
|
||||
.subgroup_size_control
|
||||
.map_or(false, |ext| ext.subgroup_size_control == vk::TRUE),
|
||||
};
|
||||
let capabilities = crate::Capabilities {
|
||||
limits: phd_capabilities.to_wgpu_limits(),
|
||||
@@ -1792,6 +1789,7 @@ impl super::Adapter {
|
||||
vendor_id: self.phd_capabilities.properties.vendor_id,
|
||||
timestamp_period: self.phd_capabilities.properties.limits.timestamp_period,
|
||||
private_caps: self.private_caps.clone(),
|
||||
features,
|
||||
workarounds: self.workarounds,
|
||||
render_passes: Mutex::new(Default::default()),
|
||||
framebuffers: Mutex::new(Default::default()),
|
||||
|
||||
@@ -789,7 +789,7 @@ impl super::Device {
|
||||
};
|
||||
|
||||
let mut flags = vk::PipelineShaderStageCreateFlags::empty();
|
||||
if self.shared.private_caps.subgroup_size_control {
|
||||
if self.shared.features.contains(wgt::Features::SUBGROUP) {
|
||||
flags |= vk::PipelineShaderStageCreateFlags::ALLOW_VARYING_SUBGROUP_SIZE
|
||||
}
|
||||
|
||||
|
||||
@@ -238,7 +238,6 @@ struct PrivateCapabilities {
|
||||
robust_image_access2: bool,
|
||||
zero_initialize_workgroup_memory: bool,
|
||||
image_format_list: bool,
|
||||
subgroup_size_control: bool,
|
||||
}
|
||||
|
||||
bitflags::bitflags!(
|
||||
@@ -344,6 +343,7 @@ struct DeviceShared {
|
||||
timestamp_period: f32,
|
||||
private_caps: PrivateCapabilities,
|
||||
workarounds: Workarounds,
|
||||
features: wgt::Features,
|
||||
render_passes: Mutex<rustc_hash::FxHashMap<RenderPassKey, vk::RenderPass>>,
|
||||
framebuffers: Mutex<rustc_hash::FxHashMap<FramebufferKey, vk::Framebuffer>>,
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user