Make all backends controlled by features (using a very ugly workaround) #6949
+176
−86
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Wumpf
changed the title
Wumpf
changed the title
brody4hire
reviewed
Jan 19, 2025
Comment on lines
22
to
+25
| "wgpu", | ||
| "wgpu-core-target-feature-conditionals/arch-wasm32", | ||
| "wgpu-core-target-feature-conditionals/native-non-apple", | ||
| "wgpu-core-target-feature-conditionals/vendor-apple", |
There was a problem hiding this comment.
Could we consider shorter names for these, perhaps with slight reordering?
Suggested change
| "wgpu", | |
| "wgpu-core-target-feature-conditionals/arch-wasm32", | |
| "wgpu-core-target-feature-conditionals/native-non-apple", | |
| "wgpu-core-target-feature-conditionals/vendor-apple", | |
| "wgpu-core-target-features/arch-wasm32", | |
| "wgpu-core-target-features/native-non-apple", | |
| "wgpu-core-target-features/vendor-apple", | |
| "wgpu", |
There was a problem hiding this comment.
yeah those names are definitely too crazy right now
Comment on lines
-69
to
-99
|
|
||
| if cfg!(native) { | ||
| if cfg!(metal) { | ||
| backends = backends.union(Backends::METAL); | ||
| } | ||
| if cfg!(dx12) { | ||
| backends = backends.union(Backends::DX12); | ||
| } | ||
|
|
||
| // Windows, Android, Linux currently always enable Vulkan and OpenGL. | ||
| // See <https://github.com/gfx-rs/wgpu/issues/3514> | ||
| if cfg!(target_os = "windows") || cfg!(unix) { | ||
| backends = backends.union(Backends::VULKAN).union(Backends::GL); | ||
| } | ||
|
|
||
| // Vulkan on Mac/iOS is only available through vulkan-portability. | ||
| if cfg!(target_vendor = "apple") && cfg!(feature = "vulkan-portability") { | ||
| backends = backends.union(Backends::VULKAN); | ||
| } | ||
|
|
||
| // GL on Mac is only available through angle. | ||
| if cfg!(target_os = "macos") && cfg!(feature = "angle") { | ||
| backends = backends.union(Backends::GL); | ||
| } | ||
| } else { | ||
| if cfg!(webgpu) { | ||
| backends = backends.union(Backends::BROWSER_WEBGPU); | ||
| } | ||
| if cfg!(webgl) { | ||
| backends = backends.union(Backends::GL); | ||
| } |
There was a problem hiding this comment.
<3 always love for removing large blocks of ugly code :)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Connections
Description
Feature flag changes:
vulkanfeature for enabling Vulkan on Windows/Android/Linux (part of default feature set)glesfeature for enabling Vulkan on Windows/Android/Linux (part of default feature set, debatable if that's a good idea)webglenabling GL on all platformsThis is achieved by introducing three proxy crates. Each depends on wgpu-core under a different platform condition and will "forward" all feature flags to it.
Reminder why this horrible construct is the only way:
This is necessary because it's impossible today to drag in a dependency conditionally BOTH on a platform & a feature flag.
It is possible to do all these things in code, so we can forward features all the way to wgpu-hal and not have it compile e.g. it's vulkan backend on Mac iff
vulkan-portabilityis off. But without this workaround it's impossible to avoid building vulkan associated dependencies anyways.For more details see
Building with
default-features=falsewill now not even drag in wgpu-core!cargo tree -p wgpu --edges normalfor simple application depending on wgpu this way:Similarly, only depending on
dx12(on Windows) doesn't includeashorglow(the former is a slow building dependency!):Testing
Checklist
cargo fmt.taplo format.cargo clippy. If applicable, add:--target wasm32-unknown-unknown--target wasm32-unknown-emscriptencargo xtask testto run tests.CHANGELOG.md. See simple instructions inside file.Draft todo: