Skip to content

Commit 8e5ac75

Browse files
authored
metal: fix Rgb9e5Ufloat capabilities and sampler_lod_average support (#2656)
1 parent c1934dc commit 8e5ac75

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

wgpu-hal/src/metal/adapter.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ impl crate::Adapter<super::Api> for super::Adapter {
202202
} else if pc.msaa_desktop {
203203
Tfc::SAMPLED_LINEAR
204204
} else {
205-
Tfc::STORAGE
205+
Tfc::SAMPLED_LINEAR
206206
| Tfc::COLOR_ATTACHMENT
207207
| Tfc::COLOR_ATTACHMENT_BLEND
208208
| Tfc::MULTISAMPLE
@@ -523,10 +523,7 @@ impl super::PrivateCapabilities {
523523
MUTABLE_COMPARISON_SAMPLER_SUPPORT,
524524
),
525525
sampler_clamp_to_border: Self::supports_any(device, SAMPLER_CLAMP_TO_BORDER_SUPPORT),
526-
sampler_lod_average: {
527-
// TODO: Clarify minimum macOS version with Apple (43707452)
528-
version.at_least((10, 13), (9, 0))
529-
},
526+
sampler_lod_average: { version.at_least((11, 0), (9, 0)) },
530527
base_instance: Self::supports_any(device, BASE_INSTANCE_SUPPORT),
531528
base_vertex_instance_drawing: Self::supports_any(device, BASE_VERTEX_INSTANCE_SUPPORT),
532529
dual_source_blending: Self::supports_any(device, DUAL_SOURCE_BLEND_SUPPORT),

wgpu-hal/src/metal/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ impl AdapterShared {
261261

262262
Self {
263263
disabilities: PrivateDisabilities::new(&device),
264-
private_caps: PrivateCapabilities::new(&device),
264+
private_caps,
265265
device: Mutex::new(device),
266266
settings: Settings::default(),
267267
}

0 commit comments

Comments
 (0)