From 161e81a0702a96efbe89dd55643c06acb2a6a4f1 Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Thu, 21 Oct 2021 11:53:57 -0400 Subject: [PATCH] hal/mtl: disable fragment r/w buffers in fragment shaders on macOS 10.11 (#2102) --- wgpu-hal/src/metal/adapter.rs | 7 ++++++- wgpu-hal/src/metal/mod.rs | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/wgpu-hal/src/metal/adapter.rs b/wgpu-hal/src/metal/adapter.rs index dbf4f1a13..d6037090c 100644 --- a/wgpu-hal/src/metal/adapter.rs +++ b/wgpu-hal/src/metal/adapter.rs @@ -580,7 +580,8 @@ impl super::PrivateCapabilities { } else { MTLLanguageVersion::V1_0 }, - exposed_queues: 1, + // macOS 10.11 doesn't support read-write resources + fragment_rw_storage: !os_is_mac || Self::version_at_least(major, minor, 10, 12), read_write_texture_tier: if os_is_mac { if Self::version_at_least(major, minor, 10, 13) { device.read_write_texture_support() @@ -901,6 +902,10 @@ impl super::PrivateCapabilities { pub fn capabilities(&self) -> crate::Capabilities { let mut downlevel = wgt::DownlevelCapabilities::default(); + downlevel.flags.set( + wgt::DownlevelFlags::FRAGMENT_WRITABLE_STORAGE, + self.fragment_rw_storage, + ); downlevel.flags.set( wgt::DownlevelFlags::CUBE_ARRAY_TEXTURES, self.texture_cube_array, diff --git a/wgpu-hal/src/metal/mod.rs b/wgpu-hal/src/metal/mod.rs index 57c91e372..55c12b595 100644 --- a/wgpu-hal/src/metal/mod.rs +++ b/wgpu-hal/src/metal/mod.rs @@ -141,7 +141,7 @@ impl crate::Instance for Instance { struct PrivateCapabilities { family_check: bool, msl_version: mtl::MTLLanguageVersion, - exposed_queues: usize, + fragment_rw_storage: bool, read_write_texture_tier: mtl::MTLReadWriteTextureTier, resource_heaps: bool, argument_buffers: bool,