Skip to content

Commit f199b99

Browse files
committed
[metal] Use raw-window-metal to do layer creation
This removes the manual implementation introduced in 7b00140.
1 parent 482a983 commit f199b99

File tree

8 files changed

+146
-319
lines changed

8 files changed

+146
-319
lines changed

.deny.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ skip-tree = [
77

88
# introduced by Deno, to be investigated
99
{ name = "petgraph", version = "0.6.5" },
10+
11+
# Winit 0.30 uses an older objc2
12+
{ name = "objc2-foundation", version = "0.2" },
1013
]
1114
skip = [
1215
# Flume uses an old version

Cargo.lock

Lines changed: 96 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ metal = "0.32"
202202
block = "0.1.6"
203203
core-graphics-types = "0.2"
204204
objc = "0.2.5"
205+
raw-window-metal = "1.0"
205206

206207
# Vulkan dependencies
207208
android_system_properties = "0.1.1"

wgpu-hal/Cargo.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ unexpected_cfgs = { level = "warn", check-cfg = [
5959
# exclude the Vulkan backend on MacOS unless a separate feature `vulkan-portability` is enabled. In response
6060
# to these features, it enables features of platform specific crates. For example, the `vulkan` feature in wgpu-core
6161
# enables the `vulkan` feature in `wgpu-core-deps-windows-linux-android` which in turn enables the
62-
# `vulkan` feature in `wgpu-hal` _only_ on those platforms. If you enable the `vulkan-portability` feature, it
62+
# `vulkan` feature in `wgpu-hal` _only_ on those platforms. If you enable the `vulkan-portability` feature, it
6363
# will enable the `vulkan` feature in `wgpu-core-deps-apple`. The only way to do this is unfortunately to have
6464
# a separate crate for each platform category that participates in the feature unification.
6565
#
@@ -83,6 +83,7 @@ metal = [
8383
"dep:objc",
8484
"dep:parking_lot",
8585
"dep:profiling",
86+
"dep:raw-window-metal",
8687
]
8788
vulkan = [
8889
"naga/spv-out",
@@ -99,6 +100,7 @@ vulkan = [
99100
"dep:ordered-float",
100101
"dep:parking_lot",
101102
"dep:profiling",
103+
"dep:raw-window-metal",
102104
"dep:smallvec",
103105
"dep:windows",
104106
"windows/Win32",
@@ -281,6 +283,9 @@ core-graphics-types = { workspace = true, optional = true }
281283
metal = { workspace = true, optional = true }
282284
objc = { workspace = true, optional = true }
283285

286+
# backend: Metal + Vulkan
287+
raw-window-metal = { workspace = true, optional = true }
288+
284289
#########################
285290
### Platform: Android ###
286291
#########################

0 commit comments

Comments
 (0)