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.

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

backport #4695 [naga] Let constant evaluation handle Compose of Splat. #4831

Closed
wants to merge 1 commit into from

Conversation

Elabajaba
Copy link
Contributor

Connections
Backports #4695 to the wgpu 0.18 branch (naga 0.14).

Description
Nested wgsl vec creation (eg. vec3<f32>(vec2<f32>(1.0), 0.0)) spits out vulkan validation errors. This backports the fix for it to naga 0.14 so that devs writing bevy shaders don't have to change shaders to avoid the validation error.

Testing
Examples still seem to run, and it fixed the vulkan validation errors when using eg. vec3<f32>(vec2<f32>(1.0), 0.0).

Checklist

  • Run cargo fmt.
  • Run cargo clippy. If applicable, add:
    • --target wasm32-unknown-unknown
    • --target wasm32-unknown-emscripten
  • Run cargo xtask test to run tests.

cargo xtask validate spv kept failing with [ERROR xtask::result] 'spirv-val' failed to run; exit code: Some(1) despite spirv-val being in my PATH on windows.

  • Add change to CHANGELOG.md. See simple instructions inside file.

Not sure how the changelog should look for the backport. Should I just copy the same message as in the changelog on trunk?

…of `Splat`.

(cherry picked from commit b7dd59e)
@Elabajaba Elabajaba requested a review from a team as a code owner December 5, 2023 07:26
@Elabajaba
Copy link
Contributor Author

Elabajaba commented Dec 5, 2023

Whoops, screwed up the cherrypick.

edit: #4833 for the fixed version with correct attribution.

@Elabajaba Elabajaba closed this Dec 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant