[naga wgsl] Add to_wgsl functions for some Naga IR types.
#7180
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
jimblandy
force-pushed
the
naga-common-to-wgsl
branch
2 times, most recently
from
3e875d7 to
27d8268
Compare
|
I've tried to tidy this up a bit by introducing a trait, and trying to get some mileage out of that in error handling. |
jimblandy
force-pushed
the
naga-common-to-wgsl
branch
3 times, most recently
from
d479b03 to
5498b85
Compare
|
Sorry for the churn in this non-draft PR. I found a few more things I needed. |
jimblandy
force-pushed
the
naga-common-to-wgsl
branch
2 times, most recently
from
f306a9d to
5e26ca1
Compare
ErichDonGubler
approved these changes
Mar 5, 2025
jimblandy
force-pushed
the
naga-common-to-wgsl
branch
2 times, most recently
from
4c17a35 to
05c8ad7
Compare
ErichDonGubler
approved these changes
Mar 5, 2025
jimblandy
force-pushed
the
naga-common-to-wgsl
branch
from
05c8ad7 to
76043e8
Compare
Introduce a new variant of `naga::back::wgsl::Error`, `Unsupported`, and let it subsume `UnsupportedMathFunction` and various uses of `Custom`. Introduce a helper function, `Error::unsupported`, for building these errors.
Define new traits in `common::wgsl`, `ToWgsl` and `TryToWgsl`, for getting the WGSL representation of some Naga IR types as `&'static str` values: - `MathFunction` - `BuiltIn` - `Interpolation` - `Sampling` - `StorageFormat` Use these functions in the WGSL backend, taking advantage of `TryToWgsl` to consolidate error reporting.
Move `back::vector_size_str` to `common`, so that front ends can use it too. This commit is code motion and `use` adjustment only, there should be no change in behavior.
Replace `naga::back::wgsl::writer::scalar_kind_str` with a `TryToWgsl` implementation for `Scalar` in `common::wgsl`. Use this where needed in the WGSL backend.
Replace `naga::back::wgsl::writer::image_dimension_str` with a `ToWgsl` implementation for `ImageDimension` in `common::wgsl`. Use this where needed in the WGSL backend.
Move `back::wgsl::address_space_str` to `common::wgsl`, so that the front end can use it too. This commit is code motion and `use` adjustment only; there should be no change in behavior.
jimblandy
force-pushed
the
naga-common-to-wgsl
branch
from
76043e8 to
4ecd313
Compare
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.
Add
to_wgslfunctions that return the WGSL representations of the following types as&'static strvalues:MathFunctionBuiltInInterpolationSamplingUse these functions in the WGSL backend.
Also add
to_wgsl_debugfunctions that return some legible string for all possible values, not just those that are defined by the WGSL standard.There are other types that it would make sense to do this for, like
ImageDimension, but these are some of the types I ended up needing for diagnostics and logging in #6833, from which I'm trying to spin them out.