diff --git a/naga/src/valid/expression.rs b/naga/src/valid/expression.rs index 68023b5bf..e5fecfb19 100644 --- a/naga/src/valid/expression.rs +++ b/naga/src/valid/expression.rs @@ -1165,7 +1165,7 @@ impl super::Validator { // WorkGroupUniformLoad .contains(TypeFlags::SIZED | TypeFlags::CONSTRUCTIBLE) { - ShaderStages::COMPUTE + ShaderStages::COMPUTE_LIKE } else { return Err(ExpressionError::InvalidWorkGroupUniformLoadResultType(ty)); } diff --git a/naga/src/valid/function.rs b/naga/src/valid/function.rs index abf6bc430..1d413dd3a 100644 --- a/naga/src/valid/function.rs +++ b/naga/src/valid/function.rs @@ -1014,7 +1014,7 @@ impl super::Validator { stages &= super::ShaderStages::FRAGMENT; } S::ControlBarrier(barrier) | S::MemoryBarrier(barrier) => { - stages &= super::ShaderStages::COMPUTE; + stages &= super::ShaderStages::COMPUTE_LIKE; if barrier.contains(crate::Barrier::SUB_GROUP) { if !self.capabilities.contains( super::Capabilities::SUBGROUP | super::Capabilities::SUBGROUP_BARRIER, @@ -1443,7 +1443,7 @@ impl super::Validator { } } S::WorkGroupUniformLoad { pointer, result } => { - stages &= super::ShaderStages::COMPUTE; + stages &= super::ShaderStages::COMPUTE_LIKE; let pointer_inner = context.resolve_type_inner(pointer, &self.valid_expression_set)?; match *pointer_inner { diff --git a/naga/src/valid/mod.rs b/naga/src/valid/mod.rs index 0be52ac9b..f25f7055e 100644 --- a/naga/src/valid/mod.rs +++ b/naga/src/valid/mod.rs @@ -297,6 +297,7 @@ bitflags::bitflags! { const COMPUTE = 0x4; const MESH = 0x8; const TASK = 0x10; + const COMPUTE_LIKE = Self::COMPUTE.bits() | Self::TASK.bits() | Self::MESH.bits(); } } @@ -548,7 +549,7 @@ impl Validator { stages |= ShaderStages::VERTEX; } if capabilities.contains(Capabilities::SUBGROUP) { - stages |= ShaderStages::FRAGMENT | ShaderStages::COMPUTE; + stages |= ShaderStages::FRAGMENT | ShaderStages::COMPUTE_LIKE; } stages };