diff --git a/CHANGELOG.md b/CHANGELOG.md index bf024ca8f2..cc8f41bc31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -62,8 +62,6 @@ for message in compilation_info By @stefnotch in [#5410](https://github.com/gfx-rs/wgpu/pull/5410) - - ### New features #### General @@ -78,6 +76,10 @@ By @stefnotch in [#5410](https://github.com/gfx-rs/wgpu/pull/5410) ### Bug Fixes +#### 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). + #### GLES / OpenGL - Fix regression on OpenGL (EGL) where non-sRGB still used sRGB [#5642](https://github.com/gfx-rs/wgpu/pull/5642) diff --git a/wgpu-hal/src/vulkan/adapter.rs b/wgpu-hal/src/vulkan/adapter.rs index 5c18c72140..82a30617f3 100644 --- a/wgpu-hal/src/vulkan/adapter.rs +++ b/wgpu-hal/src/vulkan/adapter.rs @@ -1447,9 +1447,6 @@ impl super::Instance { }), image_format_list: phd_capabilities.device_api_version >= vk::API_VERSION_1_2 || phd_capabilities.supports_extension(khr::image_format_list::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(), @@ -1766,6 +1763,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()), diff --git a/wgpu-hal/src/vulkan/device.rs b/wgpu-hal/src/vulkan/device.rs index d17abcc692..0ac83b3fa6 100644 --- a/wgpu-hal/src/vulkan/device.rs +++ b/wgpu-hal/src/vulkan/device.rs @@ -773,7 +773,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 } diff --git a/wgpu-hal/src/vulkan/mod.rs b/wgpu-hal/src/vulkan/mod.rs index 8bfcaf8ebe..9f244ff98f 100644 --- a/wgpu-hal/src/vulkan/mod.rs +++ b/wgpu-hal/src/vulkan/mod.rs @@ -236,7 +236,6 @@ struct PrivateCapabilities { robust_image_access2: bool, zero_initialize_workgroup_memory: bool, image_format_list: bool, - subgroup_size_control: bool, } bitflags::bitflags!( @@ -342,6 +341,7 @@ struct DeviceShared { timestamp_period: f32, private_caps: PrivateCapabilities, workarounds: Workarounds, + features: wgt::Features, render_passes: Mutex>, framebuffers: Mutex>, }