nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2025-02-19 18:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

vulkan feature exclude macOS and iOS by default (#3292)

Browse Source 
Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
Closes https://github.com/gfx-rs/wgpu/issues/3287
This commit is contained in:
Jinlei Li 2023-01-05 05:35:29 +08:00 committed by GitHub
parent 784ee43be7
commit 33e5b7af26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
player/Cargo.toml
View File

@ -12,7 +12,7 @@ publish = false
[features]
angle = ["wgc/angle"]
vulkan-portability = ["wgc/vulkan-portability"]
vulkan-portability = ["wgc/vulkan"]
[dependencies]
env_logger.workspace = true
@ -29,5 +29,17 @@ features = ["replay"]
workspace = true
features = ["replay", "raw-window-handle", "strict_asserts", "wgsl"]
[target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies.wgc]
workspace = true
features = ["metal"]
[target.'cfg(windows)'.dependencies.wgc]
workspace = true
features = ["dx11", "dx12"]
[target.'cfg(any(windows, all(unix, not(target_arch = "emscripten"), not(target_os = "ios"), not(target_os = "macos"))))'.dependencies.wgc]
workspace = true
features = ["vulkan"]
[dev-dependencies]
serde.workspace = true

1
wgpu-core/Cargo.toml
View File

@ -45,7 +45,6 @@ serial-pass = ["serde", "wgt/serde", "arrayvec/serde"]
id32 = []
# Enable `ShaderModuleSource::Wgsl`
wgsl = ["naga/wgsl-in"]
vulkan-portability = ["hal/vulkan"]
# Features that are intended to work on all platforms.
portable_features = ["gles", "strict_asserts", "trace", "replay", "serial-pass", "id32", "wgsl"]

4
wgpu/Cargo.toml
View File

@ -92,7 +92,7 @@ replay = ["serde", "wgc/replay"]
angle = ["wgc/angle"]
webgl = ["hal", "wgc"]
emscripten = ["webgl"]
vulkan-portability = ["wgc/vulkan-portability"]
vulkan-portability = ["wgc/vulkan"]
expose-ids = []
# wgpu-core is always available as an optional dependency, "wgc".
@ -122,7 +122,7 @@ workspace = true
features = ["dx11", "dx12"]
# We want the wgpu-core Vulkan backend on Unix (but not Emscripten) and Windows.
[target.'cfg(any(windows, all(unix, not(target_arch = "emscripten"))))'.dependencies.wgc]
[target.'cfg(any(windows, all(unix, not(target_arch = "emscripten"), not(target_os = "ios"), not(target_os = "macos"))))'.dependencies.wgc]
workspace = true
features = ["vulkan"]