diff --git a/wgpu-core/src/validation.rs b/wgpu-core/src/validation.rs index 17d65ee2a..5a34cd77b 100644 --- a/wgpu-core/src/validation.rs +++ b/wgpu-core/src/validation.rs @@ -815,19 +815,6 @@ impl NumericType { _ => false, } } - - fn is_compatible_with(&self, other: &NumericType) -> bool { - if self.scalar.kind != other.scalar.kind { - return false; - } - match (self.dim, other.dim) { - (NumericDimension::Scalar, NumericDimension::Scalar) => true, - (NumericDimension::Scalar, NumericDimension::Vector(_)) => true, - (NumericDimension::Vector(_), NumericDimension::Vector(_)) => true, - (NumericDimension::Matrix(..), NumericDimension::Matrix(..)) => true, - _ => false, - } - } } /// Return true if the fragment `format` is covered by the provided `output`. @@ -1221,8 +1208,10 @@ impl Interface { // For vertex attributes, there are defaults filled out // by the driver if data is not provided. naga::ShaderStage::Vertex => { + let is_compatible = + iv.ty.scalar.kind == provided.ty.scalar.kind; // vertex inputs don't count towards inter-stage - (iv.ty.is_compatible_with(&provided.ty), 0) + (is_compatible, 0) } naga::ShaderStage::Fragment => { if iv.interpolation != provided.interpolation {