[naga msl-out] Fix truncation of pulled vertices #7458
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
andyleiserson
commented
Apr 1, 2025
| if needs_padding_or_truncation != Ordering::Equal { | ||
| writeln!( | ||
| self.out, | ||
| "{}// {attribute_ty_name} <- {:?}", |
Contributor
Author
There was a problem hiding this comment.
Since the swizzle selector tends to be buried at the end of a very long argument list, this comment helps to call out what's going on, but if it's preferred not to add anything extraneous to the generated shaders, I'd be fine removing it.
Member
There was a problem hiding this comment.
We sometimes add these sort of comments to help debugging - it should be fine.
teoxoy
reviewed
Apr 3, 2025
naga/src/back/msl/writer.rs
Outdated
|
|
||
| // Check dimensionality of the attribute compared to the unpacking | ||
| // function. If attribute dimension is < unpack dimension, then | ||
| // we need to explicitly cast down the result. Otherwise, if attribute |
Contributor
Author
There was a problem hiding this comment.
Thanks, updated.
Vecvec
pushed a commit
to Vecvec/wgpu
that referenced
this pull request
Apr 11, 2025
jimblandy
pushed a commit
to jimblandy/wgpu
that referenced
this pull request
Apr 18, 2025
sharmajai
pushed a commit
to sharmajai/wgpu
that referenced
this pull request
Oct 12, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The vertex pulling transform transforms vertex shaders:
It is possible for the vertices to require truncation upon loading. For example, the vertex buffer could define the texture coordinate as a
vec3, but the vertex shader might not care about the z value and load the texture coordinate as avec2. Before this change, the generated code would do this by casting, which seems to be allowed fromfloat4tofloat3, but not fromfloat3tofloat2. This PR changes the truncation to use a swizzle selector to select the appropriate number of components.Fixes #7410
Testing
Adds more snapshot tests for the vertex pulling transform. I also tested that this fix does resolve the issue seen on the website linked from the original bugzilla issue.
Review note: there are four new snapshot tests, with suffixes
-x1through-x4, for loading vertices into a scalar,vec2,vec3, orvec4. The TOML files for all four are identical since they are describing the source vertex formats. The WGSL files are the same except for the type of variable that the vertex is loaded to.Squash or Rebase? Squash
Checklist
cargo fmt.taplo format.cargo clippy --tests. If applicable, add:--target wasm32-unknown-unknowncargo xtask testto run tests.CHANGELOG.mdentry.