Skip to content

Commit

Permalink
Remove the default features from wgpu-info
Browse files Browse the repository at this point in the history
  • Loading branch information
jinleili committed Jun 9, 2022
1 parent 5e07078 commit 2ca0a39
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ jobs:
if: matrix.kind == 'local' || matrix.kind == 'other'
run: |
# check with no features
cargo ${{matrix.tool}} --target ${{ matrix.target }} -p wgpu -p wgpu-core -p wgpu-info -p player
cargo ${{matrix.tool}} --target ${{ matrix.target }} -p wgpu -p wgpu-core -p wgpu-info -p player --features angle,vulkan-portability
# check with all features
# explicitly don't mention wgpu-hal so that --all-features don't apply to it
Expand All @@ -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
Expand Down
8 changes: 2 additions & 6 deletions wgpu-info/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
1 change: 1 addition & 0 deletions wgpu-info/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ This is a command line utility that does two different functions.
#### Listing Adapters

When called with no arguments, wgpu-info will list all adapters visible to wgpu and all the information about them we have.
For gl in non Linux add the angle feature, for vk on macOS add the vulkan-portability feature.

```
cargo run --bin wgpu-info
Expand Down

0 comments on commit 2ca0a39

Please sign in to comment.