Apply suggestions

Author: Vecvec

naga/src/back/glsl/mod.rs

@@ -140,10 +140,11 @@ impl crate::AddressSpace {
             | crate::AddressSpace::Storage { .. }
             | crate::AddressSpace::Handle
             | crate::AddressSpace::PushConstant
-            | crate::AddressSpace::TaskPayload
-            // just a default impl, not really supported
-            | crate::AddressSpace::RayPayload
-            | crate::AddressSpace::IncomingRayPayload => false,
+            | crate::AddressSpace::TaskPayload => false,
+
+            crate::AddressSpace::RayPayload | crate::AddressSpace::IncomingRayPayload => {
+                unreachable!()
+            }
         }
     }
 }

naga/src/back/msl/writer.rs

@@ -596,10 +596,9 @@ impl crate::AddressSpace {
             | Self::WorkGroup
             | Self::PushConstant
             | Self::Handle
-            | Self::TaskPayload
-            | Self::RayPayload
-            | Self::IncomingRayPayload => true,
+            | Self::TaskPayload => true,
             Self::Function => false,
+            Self::RayPayload | Self::IncomingRayPayload => unreachable!(),
         }
     }
 

naga/src/ir/mod.rs

@@ -344,6 +344,7 @@ pub enum ShaderStage {
 
     /// A any hit shader, in a ray tracing pipeline.
     AnyHit,
+
     /// A closest hit shader, in a ray tracing pipeline.
     ClosestHit,
 }

naga/src/valid/interface.rs

@@ -165,9 +165,9 @@ pub enum EntryPointError {
     #[error("Task payload must be at least 4 bytes, but is {0} bytes")]
     TaskPayloadTooSmall(u32),
     #[error("Only the `ray_generation`, `closest_hit`, and `any_hit` shader stages can access a global variable in the `ray_payload` address space")]
-    RayPayloadInInvalidStage,
+    RayPayloadInInvalidStage(crate::ShaderStage),
     #[error("Only the `closest_hit`, `any_hit`, and `miss` shader stages can access a global variable in the `incoming_ray_payload` address space")]
-    IncomingRayPayloadInInvalidStage,
+    IncomingRayPayloadInInvalidStage(crate::ShaderStage),
 }
 
 fn storage_usage(access: crate::StorageAccess) -> GlobalUse {
@@ -1340,7 +1340,7 @@ impl super::Validator {
                             | crate::ShaderStage::ClosestHit
                             | crate::ShaderStage::Miss
                     ) {
-                        return Err(EntryPointError::RayPayloadInInvalidStage
+                        return Err(EntryPointError::RayPayloadInInvalidStage(ep.stage)
                             .with_span_handle(var_handle, &module.global_variables));
                     }
                     GlobalUse::READ | GlobalUse::QUERY | GlobalUse::WRITE
@@ -1352,7 +1352,7 @@ impl super::Validator {
                             | crate::ShaderStage::ClosestHit
                             | crate::ShaderStage::Miss
                     ) {
-                        return Err(EntryPointError::IncomingRayPayloadInInvalidStage
+                        return Err(EntryPointError::IncomingRayPayloadInInvalidStage(ep.stage)
                             .with_span_handle(var_handle, &module.global_variables));
                     }
                     GlobalUse::READ | GlobalUse::QUERY | GlobalUse::WRITE

naga/tests/naga/wgsl_errors.rs

@@ -4562,7 +4562,7 @@ fn check_ray_tracing_pipeline_payload_disallowed() {
             {stage} fn main() {output} {{_ = payload; {stmt}}}"
             ),
             Err(naga::valid::ValidationError::EntryPoint {
-                source: naga::valid::EntryPointError::RayPayloadInInvalidStage,
+                source: naga::valid::EntryPointError::RayPayloadInInvalidStage(_),
                 ..
             },),
             Capabilities::RAY_TRACING_PIPELINE