[metal] chore: Prepare for migrating to objc2-metal
#7631
Merged
Conversation
This file contains hidden or 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
A lot of Metal types are prefixed with MTL, which makes it quite clear where they're coming from. This means that we don't loose any clarity if we import them instead of having them prefixed with `metal::`. This will make it easier to migrate to `objc2-metal` since that crate is named differently from the `metal` crate.
The `metal` crate is currently unsound regarding unknown/future enum variants, see gfx-rs/metal-rs#209 and rust-lang/rfcs#3803. `objc2-metal` fixes this by emitting C enums as a newtype + constants for each variant, but that prevents us from importing the variants/constants. So this commit converts to a pattern that works with that in preparation for the migration.
madsmtm
changed the title
objc2-metalobjc2-metal
cwfitzgerald
approved these changes
Apr 25, 2025
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.
Description
There are a few things that make the diff in #5641 larger than it needs to be. This PR intends to reduce that by making a few syntactic changes to the codebase.
In short, the changes are to import
metaltypes instead of prefixing withmetal::, and to avoid enum variant imports, see each commit for details.This should both make the above PR easier to review, and make it less effort for me to keep up to date.
Testing
Run
cargo run --bin wgpu-examples -- cubeon macOS.Squash or Rebase?
Can be rebased, but either is fine.
Checklist
cargo fmt.taplo format.cargo clippy --tests. If applicable, add:--target wasm32-unknown-unknowncargo xtask testto run tests.CHANGELOG.mdentry.