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

Re-export Naga #4172

Merged
merged 1 commit into from
Sep 25, 2023
Merged

Re-export Naga #4172

merged 1 commit into from
Sep 25, 2023

Conversation

exrook
Copy link
Contributor

@exrook exrook commented Sep 25, 2023

Checklist

  • Run cargo clippy.
  • Run cargo clippy --target wasm32-unknown-unknown if applicable.
  • Add change to CHANGELOG.md. See simple instructions inside file.

Connections
Fixes #3559

Description
Allow users to use the same version of Naga wgpu is using.

Allows the wgpu::ShaderSource::Naga and wgpu::ShaderSource::Glsl apis to be used without the user having to manually match their own naga dependency version to that of wgpu.

Testing
n/a

@exrook exrook requested a review from a team as a code owner September 25, 2023 18:22
@exrook exrook changed the title Re-export Naga (#4172) Re-export Naga Sep 25, 2023
Copy link
Member

@jimblandy jimblandy left a comment

Choose a reason for hiding this comment

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

This looks good. At first I thought it was overkill for just the shader stage and the hash table type, but people also need the right Naga if they want to use ShaderSource::Naga, so this is probably inevitable.

@jimblandy
Copy link
Member

@exrook I've enabled CI for this PR - could you take a look at the failures?

@exrook
Copy link
Contributor Author

exrook commented Sep 25, 2023

@jimblandy Just rustfmt wanting the use statements in alphabetical order, fixed 👍

@jimblandy jimblandy enabled auto-merge (rebase) September 25, 2023 20:13
@jimblandy jimblandy merged commit 27f2ce3 into gfx-rs:trunk Sep 25, 2023
20 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.

Reexport items needed to create a ShaderSource::Glsl
2 participants