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: Fix matrix by matrix division

Browse Source
This commit is contained in:
João Capucho
2022-03-02 21:43:41 +00:00
committed by Dzmitry Malyshau
parent 7f485d262b
commit 48320db507
3 changed files with 73 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/front/glsl/context.rs
View File

@@ -583,16 +583,19 @@ impl Context {
&TypeInner::Matrix {
columns: left_columns,
rows: left_rows,
..
width: left_width,
},
&TypeInner::Matrix {
columns: right_columns,
rows: right_rows,
..
width: right_width,
},
) => {
// Check that the two arguments have the same dimensions
if left_columns != right_columns || left_rows != right_rows {
if left_columns != right_columns
|| left_rows != right_rows
|| left_width != right_width
{
parser.errors.push(Error {
kind: ErrorKind::SemanticError(
format!(
@@ -606,6 +609,56 @@ impl Context {
}
match op {
BinaryOperator::Divide => {
// Naga IR doesn't support matrix division so we need to
// divide the columns individually and reassemble the matrix
let mut components = Vec::with_capacity(left_columns as usize);
for index in 0..left_columns as u32 {
// Get the column vectors
let left_vector = self.add_expression(
Expression::AccessIndex { base: left, index },
meta,
body,
);
let right_vector = self.add_expression(
Expression::AccessIndex { base: right, index },
meta,
body,
);
// Divide the vectors
let column = self.expressions.append(
Expression::Binary {
op,
left: left_vector,
right: right_vector,
},
meta,
);
components.push(column)
}
// Rebuild the matrix from the divided vectors
self.expressions.append(
Expression::Compose {
ty: parser.module.types.insert(
Type {
name: None,
inner: TypeInner::Matrix {
columns: left_columns,
rows: left_rows,
width: left_width,
},
},
Span::default(),
),
components,
},
meta,
)
}
BinaryOperator::Equal | BinaryOperator::NotEqual => {
// Naga IR doesn't support matrix comparisons so we need to
// compare the columns individually and then fold them together

1
tests/in/glsl/expressions.frag
View File

@@ -65,6 +65,7 @@ void testBinOpUintUVec(uint a, uvec4 b) {
void testBinOpMatMat(mat3 a, mat3 b) {
mat3 v;
bool c;
v = a / b;
v = a * b;
v = a + b;
v = a - b;

29
tests/out/wgsl/expressions-frag.wgsl
View File

@@ -189,19 +189,22 @@ fn testBinOpMatMat(a_12: mat3x3<f32>, b_12: mat3x3<f32>) {
b_13 = b_12;
let _e6 = a_13;
let _e7 = b_13;
v_6 = (_e6 * _e7);
let _e9 = a_13;
let _e10 = b_13;
v_6 = (_e9 + _e10);
let _e12 = a_13;
let _e13 = b_13;
v_6 = (_e12 - _e13);
let _e15 = a_13;
let _e16 = b_13;
c = (all((_e15[2] == _e16[2])) && (all((_e15[1] == _e16[1])) && all((_e15[0] == _e16[0]))));
let _e31 = a_13;
let _e32 = b_13;
c = (any((_e31[2] != _e32[2])) || (any((_e31[1] != _e32[1])) || any((_e31[0] != _e32[0]))));
v_6 = mat3x3<f32>((_e6[0] / _e7[0]), (_e6[1] / _e7[1]), (_e6[2] / _e7[2]));
let _e18 = a_13;
let _e19 = b_13;
v_6 = (_e18 * _e19);
let _e21 = a_13;
let _e22 = b_13;
v_6 = (_e21 + _e22);
let _e24 = a_13;
let _e25 = b_13;
v_6 = (_e24 - _e25);
let _e27 = a_13;
let _e28 = b_13;
c = (all((_e27[2] == _e28[2])) && (all((_e27[1] == _e28[1])) && all((_e27[0] == _e28[0]))));
let _e43 = a_13;
let _e44 = b_13;
c = (any((_e43[2] != _e44[2])) || (any((_e43[1] != _e44[1])) || any((_e43[0] != _e44[0]))));
return;
}