archive-gh-me/wgpu
1
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2025-12-08 21:26:17 +00:00
Code Issues Projects Releases Wiki Activity

feat: add link feature (#3853)

Browse Source
This commit is contained in:
Leo Kettmeir 2023-06-28 12:30:28 +02:00 committed by GitHub
parent 757245cdfc
commit 973cd3ebf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Cargo.lock generated
View File

@ -1463,10 +1463,9 @@ dependencies = [
[[package]] [[package]]
name = "metal" name = "metal"
version = "0.25.0" version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/gfx-rs/metal-rs.git?rev=a6a0446#a6a04463db388e8fd3e99095ab4fbb87cbe9d69c"
checksum = "550b24b0cd4cf923f36bae78eca457b3a10d8a6a14a9c84cb2687b527e6a84af"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 2.3.1",
"block", "block",
"core-graphics-types", "core-graphics-types",
"foreign-types 0.5.0", "foreign-types 0.5.0",

6
wgpu-core/Cargo.toml
View File

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

5
wgpu-hal/Cargo.toml
View File

@ -33,7 +33,7 @@ targets = [
[lib] [lib]
[features] [features]
default = [] default = ["link"]
metal = ["naga/msl-out", "block"] metal = ["naga/msl-out", "block"]
vulkan = ["naga/spv-out", "ash", "gpu-alloc", "gpu-descriptor", "libloading", "smallvec"] vulkan = ["naga/spv-out", "ash", "gpu-alloc", "gpu-descriptor", "libloading", "smallvec"]
gles = ["naga/glsl-out", "glow", "khronos-egl", "libloading"] 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"] windows_rs = ["gpu-allocator"]
dxc_shader_compiler = ["hassle-rs"] dxc_shader_compiler = ["hassle-rs"]
renderdoc = ["libloading", "renderdoc-sys"] renderdoc = ["libloading", "renderdoc-sys"]
link = ["metal/link"]
[[example]] [[example]]
name = "halmark" name = "halmark"
@ -101,7 +102,7 @@ d3d12 = { version = "0.6.0", git = "https://github.com/gfx-rs/d3d12-rs", rev = "
# backend: Metal # backend: Metal
block = { version = "0.1", optional = true } 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" objc = "0.2.5"
core-graphics-types = "0.1" core-graphics-types = "0.1"