Skip to content

Commit de809c8

Browse files
VladasZjimblandyxiaopengli89cwfitzgeraldsagudev
authored
Fix missing family check flag (#5754)
Co-authored-by: Jim Blandy <[email protected]> Co-authored-by: Xiaopeng Li <[email protected]> Co-authored-by: Connor Fitzgerald <[email protected]> Co-authored-by: Samson <[email protected]> Co-authored-by: Valaphee The Meerkat <[email protected]> Co-authored-by: Andreas Reich <[email protected]>
1 parent b5b39f6 commit de809c8

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@ By @stefnotch in [#5410](https://github.com/gfx-rs/wgpu/pull/5410)
9696

9797
- Ensure render pipelines have at least 1 target. By @ErichDonGubler in [#5715](https://github.com/gfx-rs/wgpu/pull/5715)
9898

99+
#### Metal
100+
101+
- Fix unrecognized selector crash on iOS 12. By @vladasz in [#5744](https://github.com/gfx-rs/wgpu/pull/5744).
102+
99103
#### Vulkan
100104

101105
- 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).

wgpu-hal/src/metal/adapter.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,9 @@ impl super::PrivateCapabilities {
736736
4
737737
},
738738
// Per https://developer.apple.com/metal/Metal-Feature-Set-Tables.pdf
739-
max_color_attachment_bytes_per_sample: if device.supports_family(MTLGPUFamily::Apple4) {
739+
max_color_attachment_bytes_per_sample: if family_check
740+
&& device.supports_family(MTLGPUFamily::Apple4)
741+
{
740742
64
741743
} else {
742744
32

0 commit comments

Comments
 (0)