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

[spv-in] null initialization for matrices

Browse Source
This commit is contained in:
Dzmitry Malyshau
2021-05-03 00:50:00 -04:00
committed by Dzmitry Malyshau
parent 3537bffad3
commit bb7ebed23a
2 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/back/glsl/mod.rs
View File

@@ -1121,7 +1121,7 @@ impl<'a, W: Write> Writer<'a, W> {
// GLSL arrays are written as `type name[size]`
let ty_name = match self.module.types[base].inner {
// Write scalar type by backend so as not to depend on the front-end implementation
// Name returned from frontend can be generated (type1, float1, etc.)
// Name returned from frontend can be generated (type1, float1, etc.)
TypeInner::Scalar { kind, width } => glsl_scalar(kind, width)?.full,
_ => &self.names[&NameKey::Type(base)],
};

47
src/front/spv/mod.rs
View File

@@ -3143,9 +3143,8 @@ impl<I: Iterator<Item = u32>> Parser<I> {
fn generate_null_constant(
&mut self,
constants: &mut Arena<crate::Constant>,
types: &Arena<crate::Type>,
types: &mut Arena<crate::Type>,
ty: Handle<crate::Type>,
inner: &crate::TypeInner,
) -> Result<crate::ConstantInner, Error> {
fn make_scalar_inner(kind: crate::ScalarKind, width: crate::Bytes) -> crate::ConstantInner {
crate::ConstantInner::Scalar {
@@ -3159,7 +3158,7 @@ impl<I: Iterator<Item = u32>> Parser<I> {
}
}
let inner = match *inner {
let inner = match types[ty].inner {
crate::TypeInner::Scalar { kind, width } => make_scalar_inner(kind, width),
crate::TypeInner::Vector { size, kind, width } => {
let mut components = Vec::with_capacity(size as usize);
@@ -3172,22 +3171,45 @@ impl<I: Iterator<Item = u32>> Parser<I> {
}
crate::ConstantInner::Composite { ty, components }
}
crate::TypeInner::Matrix {
columns,
rows,
width,
} => {
let vector_ty = types.fetch_or_append(crate::Type {
name: None,
inner: crate::TypeInner::Vector {
kind: crate::ScalarKind::Float,
size: rows,
width,
},
});
let vector_inner = self.generate_null_constant(constants, types, vector_ty)?;
let vector_handle = constants.fetch_or_append(crate::Constant {
name: None,
specialization: None,
inner: vector_inner,
});
crate::ConstantInner::Composite {
ty,
components: vec![vector_handle; columns as usize],
}
}
crate::TypeInner::Struct { ref members, .. } => {
let mut components = Vec::with_capacity(members.len());
for field in members {
let ty_inner = &types[field.ty].inner;
let inner =
self.generate_null_constant(constants, types, field.ty, ty_inner)?;
// copy out the types to avoid borrowing `members`
let member_tys = members.iter().map(|member| member.ty).collect::<Vec<_>>();
for member_ty in member_tys {
let inner = self.generate_null_constant(constants, types, member_ty)?;
components.push(constants.fetch_or_append(crate::Constant {
name: None,
specialization: None,
inner,
}));
}
crate::ConstantInner::Composite { ty, components }
}
//TODO: handle matrices, arrays
//TODO: arrays
ref other => {
log::warn!("null constant type {:?}", other);
return Err(Error::UnsupportedType(ty));
@@ -3208,12 +3230,7 @@ impl<I: Iterator<Item = u32>> Parser<I> {
let type_lookup = self.lookup_type.lookup(type_id)?;
let ty = type_lookup.handle;
let inner = self.generate_null_constant(
&mut module.constants,
&module.types,
ty,
&module.types[ty].inner,
)?;
let inner = self.generate_null_constant(&mut module.constants, &mut module.types, ty)?;
self.lookup_constant.insert(
id,