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

[glsl-in] Apply constant binary ops to composites

Browse Source
This commit is contained in:
João Capucho
2021-06-20 11:00:31 +01:00
committed by Dzmitry Malyshau
parent 60644504d8
commit e7d712e608
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/front/glsl/constants.rs
View File

@@ -340,10 +340,10 @@ impl<'a> ConstantSolver<'a> {
left: Handle<Constant>,
right: Handle<Constant>,
) -> Result<Handle<Constant>, ConstantSolvingError> {
let left = &self.constants[left].inner;
let right = &self.constants[right].inner;
let left_inner = &self.constants[left].inner;
let right_inner = &self.constants[right].inner;
let inner = match (left, right) {
let inner = match (left_inner, right_inner) {
(
&ConstantInner::Scalar {
value: left_value,
@@ -416,6 +416,20 @@ impl<'a> ConstantSolver<'a> {
ConstantInner::Scalar { value, width }
}
(&ConstantInner::Composite { ref components, ty }, &ConstantInner::Scalar { .. }) => {
let mut components = components.clone();
for comp in components.iter_mut() {
*comp = self.binary_op(op, *comp, right)?;
}
ConstantInner::Composite { ty, components }
}
(&ConstantInner::Scalar { .. }, &ConstantInner::Composite { ref components, ty }) => {
let mut components = components.clone();
for comp in components.iter_mut() {
*comp = self.binary_op(op, left, *comp)?;
}
ConstantInner::Composite { ty, components }
}
_ => return Err(ConstantSolvingError::InvalidBinaryOpArgs),
};