diff --git a/src/back/glsl/features.rs b/src/back/glsl/features.rs index e76003f211..9699f98e19 100644 --- a/src/back/glsl/features.rs +++ b/src/back/glsl/features.rs @@ -280,7 +280,7 @@ impl<'a, W> Writer<'a, W> { } } - fn varying_required_features(&mut self, binding: Option<&Binding>, ty: Handle) { + fn varying_required_features(&mut self, binding: Option<&Binding>, ty: Handle) { match self.module.types[ty].inner { crate::TypeInner::Struct { ref members, .. } => { for member in members { @@ -290,9 +290,11 @@ impl<'a, W> Writer<'a, W> { _ => { if let Some(&Binding::Location(_, Some(interpolation))) = binding { match interpolation { - Interpolation::Linear => self.features.request(Features::NOPERSPECTIVE_QUALIFIER), + Interpolation::Linear => { + self.features.request(Features::NOPERSPECTIVE_QUALIFIER) + } Interpolation::Sample => self.features.request(Features::SAMPLE_QUALIFIER), - _ => () + _ => (), }; } } diff --git a/src/valid/expression.rs b/src/valid/expression.rs index 0ab075af11..9a1872d130 100644 --- a/src/valid/expression.rs +++ b/src/valid/expression.rs @@ -949,7 +949,7 @@ impl super::Validator { _ => return Err(ExpressionError::InvalidArgumentType(fun, 0, arg)), } } - Mf::Atan2 | Mf::Pow | Mf::Distance => { + Mf::Atan2 | Mf::Pow | Mf::Distance | Mf::Step => { let arg1_ty = match (arg1_ty, arg2_ty) { (Some(ty1), None) => ty1, _ => return Err(ExpressionError::WrongArgumentCount(fun)), @@ -1006,7 +1006,7 @@ impl super::Validator { )); } } - Mf::Dot | Mf::Outer | Mf::Cross | Mf::Step | Mf::Reflect => { + Mf::Dot | Mf::Outer | Mf::Cross | Mf::Reflect => { let arg1_ty = match (arg1_ty, arg2_ty) { (Some(ty1), None) => ty1, _ => return Err(ExpressionError::WrongArgumentCount(fun)), diff --git a/tests/snapshots.rs b/tests/snapshots.rs index bc5b566143..80b7ecf212 100644 --- a/tests/snapshots.rs +++ b/tests/snapshots.rs @@ -35,7 +35,7 @@ struct Parameters { msl_custom: bool, #[cfg_attr(not(feature = "glsl-out"), allow(dead_code))] #[serde(default)] - glsl_desktop_version: Option + glsl_desktop_version: Option, } #[allow(dead_code, unused_variables)] @@ -225,7 +225,10 @@ fn convert_wgsl() { ("image-copy", Targets::METAL), ("texture-array", Targets::SPIRV | Targets::METAL), ("operators", Targets::SPIRV | Targets::METAL | Targets::GLSL), - ("interpolate", Targets::SPIRV | Targets::METAL | Targets::GLSL), + ( + "interpolate", + Targets::SPIRV | Targets::METAL | Targets::GLSL, + ), ]; for &(name, targets) in inputs.iter() {