mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-20 06:21:13 +01:00
[spv-in] work around sign differences in OpIAdd and OpISubtract
This commit is contained in:
1 parent
64856a808e
commit
34b830da17
2 files changed
+79
-2
No files matched your search
+69
-2
@@ -593,6 +593,57 @@ impl<I: Iterator<Item = u32>> Parser<I> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// A more complicated version of the binary op,
|
||||||
|
/// where we force the operand to have the same type as the result.
|
||||||
|
/// This is mostly needed for "i++" and "i--" coming from GLSL.
|
||||||
|
fn parse_expr_binary_op_sign_adjusted(
|
||||||
|
&mut self,
|
||||||
|
expressions: &mut Arena<crate::Expression>,
|
||||||
|
op: crate::BinaryOperator,
|
||||||
|
types: &Arena<crate::Type>,
|
||||||
|
) -> Result<(), Error> {
|
||||||
|
let result_type_id = self.next()?;
|
||||||
|
let result_id = self.next()?;
|
||||||
|
let p1_id = self.next()?;
|
||||||
|
let p2_id = self.next()?;
|
||||||
|
|
||||||
|
let p1_lexp = self.lookup_expression.lookup(p1_id)?;
|
||||||
|
let p2_lexp = self.lookup_expression.lookup(p2_id)?;
|
||||||
|
let result_lookup_ty = self.lookup_type.lookup(result_type_id)?;
|
||||||
|
let kind = types[result_lookup_ty.handle].inner.scalar_kind().unwrap();
|
||||||
|
|
||||||
|
let expr = crate::Expression::Binary {
|
||||||
|
op,
|
||||||
|
left: if p1_lexp.type_id == result_type_id {
|
||||||
|
p1_lexp.handle
|
||||||
|
} else {
|
||||||
|
expressions.append(crate::Expression::As {
|
||||||
|
expr: p1_lexp.handle,
|
||||||
|
kind,
|
||||||
|
convert: true,
|
||||||
|
})
|
||||||
|
},
|
||||||
|
right: if p2_lexp.type_id == result_type_id {
|
||||||
|
p2_lexp.handle
|
||||||
|
} else {
|
||||||
|
expressions.append(crate::Expression::As {
|
||||||
|
expr: p2_lexp.handle,
|
||||||
|
kind,
|
||||||
|
convert: true,
|
||||||
|
})
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
self.lookup_expression.insert(
|
||||||
|
result_id,
|
||||||
|
LookupExpression {
|
||||||
|
handle: expressions.append(expr),
|
||||||
|
type_id: result_type_id,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
fn parse_expr_shift_op(
|
fn parse_expr_shift_op(
|
||||||
&mut self,
|
&mut self,
|
||||||
expressions: &mut Arena<crate::Expression>,
|
expressions: &mut Arena<crate::Expression>,
|
||||||
@@ -1255,11 +1306,27 @@ impl<I: Iterator<Item = u32>> Parser<I> {
|
|||||||
inst.expect(4)?;
|
inst.expect(4)?;
|
||||||
self.parse_expr_unary_op(expressions, crate::UnaryOperator::Negate)?;
|
self.parse_expr_unary_op(expressions, crate::UnaryOperator::Negate)?;
|
||||||
}
|
}
|
||||||
Op::IAdd | Op::FAdd => {
|
Op::IAdd => {
|
||||||
|
inst.expect(5)?;
|
||||||
|
self.parse_expr_binary_op_sign_adjusted(
|
||||||
|
expressions,
|
||||||
|
crate::BinaryOperator::Add,
|
||||||
|
type_arena,
|
||||||
|
)?;
|
||||||
|
}
|
||||||
|
Op::FAdd => {
|
||||||
inst.expect(5)?;
|
inst.expect(5)?;
|
||||||
self.parse_expr_binary_op(expressions, crate::BinaryOperator::Add)?;
|
self.parse_expr_binary_op(expressions, crate::BinaryOperator::Add)?;
|
||||||
}
|
}
|
||||||
Op::ISub | Op::FSub => {
|
Op::ISub => {
|
||||||
|
inst.expect(5)?;
|
||||||
|
self.parse_expr_binary_op_sign_adjusted(
|
||||||
|
expressions,
|
||||||
|
crate::BinaryOperator::Subtract,
|
||||||
|
type_arena,
|
||||||
|
)?;
|
||||||
|
}
|
||||||
|
Op::FSub => {
|
||||||
inst.expect(5)?;
|
inst.expect(5)?;
|
||||||
self.parse_expr_binary_op(expressions, crate::BinaryOperator::Subtract)?;
|
self.parse_expr_binary_op(expressions, crate::BinaryOperator::Subtract)?;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -693,6 +693,16 @@ impl super::Validator {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
if !good {
|
if !good {
|
||||||
|
log::error!(
|
||||||
|
"Left: {:?} of type {:?}",
|
||||||
|
function.expressions[left],
|
||||||
|
left_inner
|
||||||
|
);
|
||||||
|
log::error!(
|
||||||
|
"Right: {:?} of type {:?}",
|
||||||
|
function.expressions[right],
|
||||||
|
right_inner
|
||||||
|
);
|
||||||
return Err(ExpressionError::InvalidBinaryOperandTypes(op, left, right));
|
return Err(ExpressionError::InvalidBinaryOperandTypes(op, left, right));
|
||||||
}
|
}
|
||||||
ShaderStages::all()
|
ShaderStages::all()
|
||||||
|
|||||||
Reference in new issue
Block a user