Not operator depending on expression type

src/back/hlsl/writer.rs

@@ -1751,10 +1751,21 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
  }
  }
  Expression::Unary { op, expr } => {
+ use crate::{ScalarKind as Sk, UnaryOperator as Uo};
  // https://docs.microsoft.com/en-us/windows/win32/direct3dhlsl/dx-graphics-hlsl-operators#unary-operators
  let op_str = match op {
- crate::UnaryOperator::Negate => "-",
- crate::UnaryOperator::Not => "!",
+ Uo::Negate => "-",
+ Uo::Not => match *func_ctx.info[expr].ty.inner_with(&module.types) {
+ TypeInner::Scalar { kind: Sk::Sint, .. } => "~",
+ TypeInner::Scalar { kind: Sk::Uint, .. } => "~",
+ TypeInner::Scalar { kind: Sk::Bool, .. } => "!",
+ ref other => {
+ return Err(Error::Custom(format!(
+ "Cannot apply not to type {:?}",
+ other
+ )))
+ }
+ },
  };
  write!(self.out, "{}", op_str)?;
  self.write_expr(module, expr, func_ctx)?;

src/back/msl/writer.rs

@@ -1406,9 +1406,15 @@ impl<W: Write> Writer<W> {
  }
  },
  crate::Expression::Unary { op, expr } => {
+ use crate::{ScalarKind as Sk, UnaryOperator as Uo};
  let op_str = match op {
- crate::UnaryOperator::Negate => "-",
- crate::UnaryOperator::Not => "!",
+ Uo::Negate => "-",
+ Uo::Not => match *context.resolve_type(expr) {
+ crate::TypeInner::Scalar { kind: Sk::Sint, .. } => "~",
+ crate::TypeInner::Scalar { kind: Sk::Uint, .. } => "~",
+ crate::TypeInner::Scalar { kind: Sk::Bool, .. } => "!",
+ _ => return Err(Error::Validation),
+ },
  };
  write!(self.out, "{}", op_str)?;
  self.put_expression(expr, context, false)?;

tests/out/hlsl/operators.hlsl

@@ -33,7 +33,7 @@ int unary()
  if (!true) {
  return 1;
  } else {
- return !1;
+ return ~1;
  }
 }
 

tests/out/msl/operators.msl

@@ -38,7 +38,7 @@ int unary(
  if (!true) {
  return 1;
  } else {
- return !1;
+ return ~1;
  }
 }