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

Upgrade to WGPU 22 #98

Merged
merged 5 commits into from
Aug 3, 2024
Merged

Upgrade to WGPU 22 #98

merged 5 commits into from
Aug 3, 2024

Conversation

callym
Copy link
Contributor

@callym callym commented Jul 19, 2024

This currently doesn't pass the tests, I think because naga removed the PartialEq implementation on a bunch of types (gfx-rs/wgpu#5818)

@Elabajaba
Copy link
Contributor

Elabajaba commented Jul 20, 2024

I haven't ran it locally to check if this is the issue, but the test output tends to change a bit on wgpu/naga upgrades. If it looks functionally the same it's probably fine to just overwrite the failing tests' expected outputs.

@teoxoy
Copy link

teoxoy commented Jul 25, 2024

I put up gfx-rs/wgpu#6045 that will be backported and part of the 22.1 release.

@JMS55
Copy link
Contributor

JMS55 commented Aug 1, 2024

Naga 22.1 has released with PartialEq back on types.

@callym
Copy link
Contributor Author

callym commented Aug 1, 2024

I've updated some failing tests - to me it looks like just the numbering in the error message is different

@callym callym marked this pull request as ready for review August 1, 2024 17:16
Cargo.toml Outdated Show resolved Hide resolved
@Elabajaba
Copy link
Contributor

I opened a PR for this with a few fixes and cleanups callym#1

We'll have to update bevy's capabilities detection as well.

@callym
Copy link
Contributor Author

callym commented Aug 1, 2024

The test failures are assertions that were never hit before because they used #[cfg(debug)] instead of #[cfg(debug_assertions)]

@Elabajaba
Copy link
Contributor

Oops, I guess I probably should've ran the tests locally when I fixed that.

@callym
Copy link
Contributor Author

callym commented Aug 1, 2024

I don't think there's any way that check could ever work as the final shader string length is almost always going to be different to the initial string, for example here's one of the outputs:

initial shader string:
"#import test_module\n\nfn main() -> f32 {\n return test_module::entry_point();\n}\n"

final string after preprocess:
" \n\nfn main() -> f32 {\n return entry_pointX_naga_oil_mod_XORSXG5C7NVXWI5LMMUX();\n}\n"

Copy link
Collaborator

@robtfm robtfm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm - haven't tested thoroughly but i agree the length check is vestigial, and the rest looks straightforward.

@mockersf mockersf merged commit 17a076f into bevyengine:master Aug 3, 2024
7 checks passed
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.

7 participants