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

Typifier support for vector * matrix multiplication

Browse Source
This commit is contained in:
Dzmitry Malyshau
2021-01-09 20:58:51 -05:00
committed by Dzmitry Malyshau
parent 08b6c416a3
commit c6658e775d
1 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/proc/typifier.rs
View File

@@ -217,30 +217,38 @@ impl Typifier {
let ty_right = self.get(right, types);
if ty_left == ty_right {
self.resolutions[left.index()].clone()
} else if let crate::TypeInner::Scalar { .. } = *ty_left {
self.resolutions[right.index()].clone()
} else if let crate::TypeInner::Scalar { .. } = *ty_right {
self.resolutions[left.index()].clone()
} else if let crate::TypeInner::Matrix {
columns,
rows: _,
width,
} = *ty_left
{
Resolution::Value(crate::TypeInner::Vector {
size: columns,
kind: crate::ScalarKind::Float,
width,
})
} else if let crate::TypeInner::Matrix {
columns: _,
rows,
width,
} = *ty_right
{
Resolution::Value(crate::TypeInner::Vector {
size: rows,
kind: crate::ScalarKind::Float,
width,
})
} else {
match *ty_left {
crate::TypeInner::Scalar { .. } => {
self.resolutions[right.index()].clone()
}
crate::TypeInner::Matrix {
columns,
rows: _,
width,
} => Resolution::Value(crate::TypeInner::Vector {
size: columns,
kind: crate::ScalarKind::Float,
width,
}),
_ => {
return Err(ResolveError::IncompatibleOperands {
op: "x".to_string(),
left: format!("{:?}", ty_left),
right: format!("{:?}", ty_right),
})
}
}
return Err(ResolveError::IncompatibleOperands {
op: "x".to_string(),
left: format!("{:?}", ty_left),
right: format!("{:?}", ty_right),
});
}
}
crate::BinaryOperator::Equal