github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

[naga] Add TypeInner::scalar_for_conversions helper function.

Browse Source 
Define a new helper function on `naga::ir::TypeInner`,
`scalar_for_conversions`, that returns the leaf scalar of a type as
relevant for WGSL-style automatic conversions. Specifically, this
means that, unlike `TypeInner::scalar`, arrays are considered to have
leaf scalars if their elements do.
This commit is contained in:
Jim Blandy
2025-03-24 14:11:09 -07:00
committed by Connor Fitzgerald
parent def9d7142a
commit a8a49993c2
1 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
naga/src/proc/type_methods.rs
View File

@@ -102,6 +102,12 @@ impl crate::TypeInner {
///
/// If `inner` is a scalar, vector, or matrix type, return
/// its scalar type. Otherwise, return `None`.
///
/// Note that this doesn't inspect [`Array`] types, as required
/// for automatic conversions. For that, see [`scalar_for_conversions`].
///
/// [`Array`]: crate::TypeInner::Array
/// [`scalar_for_conversions`]: crate::TypeInner::scalar_for_conversions
pub const fn scalar(&self) -> Option<crate::Scalar> {
use crate::TypeInner as Ti;
match *self {
@@ -120,6 +126,31 @@ impl crate::TypeInner {
self.scalar().map(|scalar| scalar.width)
}
/// Return the leaf scalar type of `self`, as needed for automatic conversions.
///
/// Unlike the [`scalar`] method, which only retrieves scalars for
/// [`Scalar`], [`Vector`], and [`Matrix`] this also looks into
/// [`Array`] types to find the leaf scalar.
///
/// [`scalar`]: crate::TypeInner::scalar
/// [`Scalar`]: crate::TypeInner::Scalar
/// [`Vector`]: crate::TypeInner::Vector
/// [`Matrix`]: crate::TypeInner::Matrix
/// [`Array`]: crate::TypeInner::Array
pub fn scalar_for_conversions(
&self,
types: &crate::UniqueArena<crate::Type>,
) -> Option<crate::Scalar> {
use crate::TypeInner as Ti;
match *self {
Ti::Scalar(scalar) | Ti::Vector { scalar, .. } | Ti::Matrix { scalar, .. } => {
Some(scalar)
}
Ti::Array { base, .. } => types[base].inner.scalar_for_conversions(types),
_ => None,
}
}
pub const fn pointer_space(&self) -> Option<crate::AddressSpace> {
match *self {
Self::Pointer { space, .. } => Some(space),