metal: roll metal-rs, fix read_write_texture_tier

gfx-rs · Mar 2, 2022 · c4e9797 · c4e9797
1 parent e672974
commit c4e9797
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml
@@ -77,7 +77,7 @@ winapi = { version = "0.3", features = ["libloaderapi", "windef", "winuser", "dc
 native = { package = "d3d12", version = "0.4.1", features = ["libloading"], optional = true }
 
 [target.'cfg(any(target_os="macos", target_os="ios"))'.dependencies]
-mtl = { package = "metal", git = "https://github.com/gfx-rs/metal-rs", rev = "44af5cc" }
+mtl = { package = "metal", git = "https://github.com/gfx-rs/metal-rs", rev = "a357159" }
 objc = "0.2.5"
 core-graphics-types = "0.1"
 

diff --git a/wgpu-hal/src/metal/adapter.rs b/wgpu-hal/src/metal/adapter.rs
@@ -660,6 +660,12 @@ impl super::PrivateCapabilities {
             read_write_texture_tier: if os_is_mac {
                 if Self::version_at_least(major, minor, 10, 13) {
                     device.read_write_texture_support()
+                } else if Self::version_at_least(major, minor, 10, 12) {
+                    if Self::supports_any(device, &[MTLFeatureSet::macOS_ReadWriteTextureTier2]) {
+                        mtl::MTLReadWriteTextureTier::Tier2
+                    } else {
+                        mtl::MTLReadWriteTextureTier::Tier1
+                    }
                 } else {
                     mtl::MTLReadWriteTextureTier::TierNone
                 }

diff --git a/wgpu-hal/src/metal/device.rs b/wgpu-hal/src/metal/device.rs
@@ -644,6 +644,7 @@ impl crate::Device<super::Api> for super::Device {
                     mtl::MTLLanguageVersion::V2_1 => (2, 1),
                     mtl::MTLLanguageVersion::V2_2 => (2, 2),
                     mtl::MTLLanguageVersion::V2_3 => (2, 3),
+                    mtl::MTLLanguageVersion::V2_4 => (2, 4),
                 },
                 inline_samplers: Default::default(),
                 spirv_cross_compatibility: false,