From 048a420d82212c8fa1f94605e05331746ccee136 Mon Sep 17 00:00:00 2001 From: Jinlei Li Date: Sat, 11 Jun 2022 03:57:06 +0800 Subject: [PATCH] Remove the default features from wgpu-info (#2753) Co-authored-by: Connor Fitzgerald --- .github/workflows/ci.yml | 2 +- wgpu-info/Cargo.toml | 8 ++------ wgpu-info/README.md | 2 ++ 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a584390e0..5278c8afc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -218,7 +218,7 @@ jobs: shell: bash run: | # run wgpu-info - cargo run --bin wgpu-info + cargo run --bin wgpu-info --features angle,vulkan-portability # run unit and player tests cargo nextest run -p wgpu-types -p wgpu-hal -p wgpu-core -p player --no-fail-fast # run native tests diff --git a/wgpu-info/Cargo.toml b/wgpu-info/Cargo.toml index 322cbbf41..13767cc2c 100644 --- a/wgpu-info/Cargo.toml +++ b/wgpu-info/Cargo.toml @@ -9,10 +9,6 @@ repository = "https://github.com/gfx-rs/wgpu" keywords = ["graphics"] license = "MIT OR Apache-2.0" -# Even if you aren't actually building `wgpu-info`, -# enabling the `angle` and `vulkan-portability` features of wgpu enables them for everything built in this workspace. -# This includes the web examples, which fail to compile when Vulkan is enabled, -# so disable that on web (by just disabling everything, since this won't compile for wasm anyway). -[target.'cfg(not(target_arch = "wasm32"))'.dependencies] +[dependencies] env_logger = "0.9" -wgpu = { version = "0.12", path = "../wgpu", features = ["angle", "vulkan-portability"] } +wgpu = { version = "0.12", path = "../wgpu" } diff --git a/wgpu-info/README.md b/wgpu-info/README.md index 7d3d703a9..7857553b7 100644 --- a/wgpu-info/README.md +++ b/wgpu-info/README.md @@ -6,6 +6,8 @@ This is a command line utility that does two different functions. When called with no arguments, wgpu-info will list all adapters visible to wgpu and all the information about them we have. +For OpenGL on platforms other than Linux add the `angle` feature, for Vulkan on macOS add the `vulkan-portability` feature. + ``` cargo run --bin wgpu-info ```