Merge branch 'trunk' into depth-clip-control

wgpu-core/Cargo.toml

@@ -22,7 +22,7 @@ targets = [
 [lib]
 
 [features]
-default = []
+default = ["link"]
 
 # Backends, passed through to wgpu-hal
 metal = ["hal/metal"]
@@ -31,6 +31,9 @@ gles = ["hal/gles"]
 dx11 = ["hal/dx11"]
 dx12 = ["hal/dx12"]
 
+# Use static linking for libraries. Disale to manually link. Enabled by default.
+link = ["hal/link"]
+
 # Support the Renderdoc graphics debugger:
 # https://renderdoc.org/
 renderdoc = ["hal/renderdoc"]
@@ -80,6 +83,7 @@ version = "0.16"
 package = "wgpu-hal"
 path = "../wgpu-hal"
 version = "0.16"
+default_features = false
 
 [target.'cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))'.dependencies]
 web-sys = { version = "0.3.60", features = ["HtmlCanvasElement", "OffscreenCanvas"] }

wgpu-hal/Cargo.toml

@@ -33,7 +33,7 @@ targets = [
 [lib]
 
 [features]
-default = []
+default = ["link"]
 metal = ["naga/msl-out", "block"]
 vulkan = ["naga/spv-out", "ash", "gpu-alloc", "gpu-descriptor", "libloading", "smallvec"]
 gles = ["naga/glsl-out", "glow", "khronos-egl", "libloading"]
@@ -43,6 +43,7 @@ dx12 = ["naga/hlsl-out", "d3d12", "bit-set", "range-alloc", "winapi/std", "winap
 windows_rs = ["gpu-allocator"]
 dxc_shader_compiler = ["hassle-rs"]
 renderdoc = ["libloading", "renderdoc-sys"]
+link = ["metal/link"]
 
 [[example]]
 name = "halmark"
@@ -101,7 +102,7 @@ d3d12 = { version = "0.6.0", git = "https://github.com/gfx-rs/d3d12-rs", rev = "
 # backend: Metal
 block = { version = "0.1", optional = true }
 
-metal = "0.25.0"
+metal = { git = "https://github.com/gfx-rs/metal-rs.git", rev = "a6a0446", default_features = false }
 objc = "0.2.5"
 core-graphics-types = "0.1"