[naga] Introduce Scalar type to IR.
#4673
Merged
Conversation
This file contains 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
introduce-scalar-struct
branch
from
b569412 to
c06ddad
Compare
jimblandy
changed the title
Scalar type to IR.Scalar type to Naga IR.
jimblandy
changed the title
Scalar type to Naga IR.Scalar type to IR.
jimblandy
force-pushed
the
introduce-scalar-struct
branch
2 times, most recently
from
fb17406 to
8442dfd
Compare
Introduce a new struct type, `Scalar`, combining a `ScalarKind` and a `Bytes` width, and use this whenever such pairs of values are passed around. In particular, use `Scalar` in `TypeInner` variants `Scalar`, `Vector`, `Atomic`, and `ValuePointer`. Introduce associated `Scalar` constants `I32`, `U32`, `F32`, `BOOL` and `F64`, for common cases. Introduce a helper function `Scalar::float` for constructing `Float` scalars of a given width, for dealing with `TypeInner::Matrix`, which only supplies the scalar width of its elements, not a kind. Introduce helper functions on `Literal` and `TypeInner`, to produce the `Scalar` describing elements' values. Use `Scalar` in `wgpu_core::validation::NumericType` as well.
jimblandy
force-pushed
the
introduce-scalar-struct
branch
from
8442dfd to
68316e3
Compare
teoxoy
approved these changes
Nov 14, 2023
3 tasks
jimblandy
added a commit
to jimblandy/wgpu
that referenced
this pull request
Nov 14, 2023
The first argument of the `dot`, `reflect`, `distance`, and `ldexp` GLSL builtin functions may be either a float or a double, and thus the argument type registered by `inject_common_builtin` must depend on the `float_width` argument; it cannot simply be `Scalar::F32`. Introduced by gfx-rs#4673.
jimblandy
added a commit
to jimblandy/wgpu
that referenced
this pull request
Nov 15, 2023
The first argument of the `dot`, `reflect`, `distance`, and `ldexp` GLSL builtin functions may be either a float or a double, and thus the argument type registered by `inject_common_builtin` must depend on the `float_width` argument; it cannot simply be `Scalar::F32`. Introduced by gfx-rs#4673.
jimblandy
added a commit
that referenced
this pull request
Nov 15, 2023
The first argument of the `dot`, `reflect`, `distance`, and `ldexp` GLSL builtin functions may be either a float or a double, and thus the argument type registered by `inject_common_builtin` must depend on the `float_width` argument; it cannot simply be `Scalar::F32`. Introduced by #4673.
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.
Introduce a new struct type,
Scalar, combining aScalarKindand aByteswidth, and use this whenever such pairs of values are passed around.In particular, use
ScalarinTypeInnervariantsScalar,Vector,Atomic, andValuePointer.Introduce associated
ScalarconstantsI32,U32,F32,BOOLandF64, for common cases.Introduce a helper function
Scalar::floatfor constructingFloatscalars of a given width, for dealing withTypeInner::Matrix, which only supplies the scalar width of its elements, not a kind.Introduce helper functions on
LiteralandTypeInner, to produce theScalardescribing elements' values.Checklist
cargo clippy.cargo clippy --target wasm32-unknown-unknownif applicable.