Open
Conversation
feature: specify spirv-builder source by Cargo.toml dep verbatim
…olchain feat: use rustup to install toolchain and components
fix: provide spirv-builder with a path to a specific target-spec file
…h local rust-gpu checkouts
|
Sounds good! |
0cc7fc8 to
3fafa5b
Compare
Collaborator
|
Thanks for doing this! |
LegNeato
approved these changes
Apr 9, 2026
Contributor
|
🎉 🙇 |
nazar-pc
reviewed
Apr 9, 2026
Member
Author
Contributor
|
IMHO rebase is generally a bad approach to merging PRs. With the primary reason being that you can no longer do |
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
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.

Merges the cargo-gpu repository into the rust-gpu repository, to make it easier to edit spirv-builder and cargo-gpu at the same time. It's pretty annoying to juggle two PRs in two different projects, both of which need to pass, and when rust-gpu merges you still have to update the cargo-gpu rev before merging that one. Way easier if they're in the same repo!
This PR conserves the entire history of cargo-gpu by adding it as a
git subtreeand then moving files into the proper places, which is why this PR is so big. I recommend just reviewing the last commits, prefixed withcargo-gpu:.I feel like I should ping @schell @tombh so that they're both aware of this.
CI
I've merged the CI actions from cargo-gpu into the rust-gpu ones. The cargo-gpu CI checks backwards compatibility with various old rust-gpu versions, which leads to a significant increase in the amount of jobs. This goes beyond the 20 or so parallel jobs github gives for free, meaning that some jobs must wait on others to complete, increase total CI time by 1-2min at the minimum, maybe more if the windows jobs have to wait. We may want to consider:
cargo-denyjob.cargo-gpu,cargo-gpu-install,spirv-buildercrates andCargo.lockshader-crate-template
I'm not sure if we want to keep the
shader-crate-templatecrate as it is right now:/cratesI feel like a followup PR would be better suited for this.