diag(naga): merge FunctionError::InvalidStoreValue with InvalidStoreTypes

Author: ErichDonGubler

naga/src/valid/function.rs

@@ -151,7 +151,9 @@ pub enum FunctionError {
     #[error("The type of {value:?} doesn't match the type stored in {pointer:?}")]
     InvalidStoreTypes {
         pointer: Handle<crate::Expression>,
+        pointer_ty: crate::TypeInner,
         value: Handle<crate::Expression>,
+        value_ty: crate::TypeInner,
     },
     #[error("Image store parameters are invalid")]
     InvalidImageStore(#[source] ExpressionError),
@@ -1022,7 +1024,9 @@ impl super::Validator {
                         }
                     }
 
+                    let pointer_ty = context.resolve_pointer_type(pointer);
                     let value_ty = context.resolve_type(value, &self.valid_expression_set)?;
+
                     match *value_ty {
                         Ti::Image { .. } | Ti::Sampler { .. } => {
                             return Err(FunctionError::InvalidStoreTexture {
@@ -1038,8 +1042,6 @@ impl super::Validator {
                         _ => {}
                     }
 
-                    let pointer_ty = context.resolve_pointer_type(pointer);
-
                     let good = match *pointer_ty {
                         Ti::Pointer { base, space: _ } => match context.types[base].inner {
                             Ti::Atomic(scalar) => *value_ty == Ti::Scalar(scalar),
@@ -1058,10 +1060,15 @@ impl super::Validator {
                         _ => false,
                     };
                     if !good {
-                        return Err(FunctionError::InvalidStoreTypes { pointer, value }
-                            .with_span()
-                            .with_handle(pointer, context.expressions)
-                            .with_handle(value, context.expressions));
+                        return Err(FunctionError::InvalidStoreTypes {
+                            pointer,
+                            pointer_ty: pointer_ty.clone(),
+                            value,
+                            value_ty: value_ty.clone(),
+                        }
+                        .with_span()
+                        .with_handle(pointer, context.expressions)
+                        .with_handle(value, context.expressions));
                     }
 
                     if let Some(space) = pointer_ty.pointer_space() {