Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix wasm examples failing to compile #2524

Merged
merged 2 commits into from
Mar 6, 2022
Merged

Fix wasm examples failing to compile #2524

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f51466
Fix wasm examples failing to compile
Liamolucko Mar 5, 2022
e4ac0f7
`#[cfg]` away the contents of `wgpu-info` when compiling for wasm
Liamolucko Mar 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix wasm examples failing to compile 
They were broken by 476b6a1, because apparently enabling a feature in any package enables it for the whole workspace, and the wasm examples fail to compile with vulkan enabled.

It wasn't failing in CI because CI specifies `-p wgpu`, which seems to stop `wgpu-info`'s enabling of features having an effect.
  • Loading branch information
@Liamolucko
Liamolucko committed Mar 5, 2022
commit 7f51466b20abb680f832bc678d48d4dc7746f3c9
6 changes: 5 additions & 1 deletion wgpu-info/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ repository = "https://github.com/gfx-rs/wgpu"
keywords = ["graphics"]
license = "MIT OR Apache-2.0"

[dependencies]
# 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]
env_logger = "0.9"
wgpu = { version = "0.12", path = "../wgpu", features = ["angle", "vulkan-portability"] }