mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-20 06:21:13 +01:00
Fix mesh shader validation (#8749)
This commit is contained in:
1 parent
49be67a5a6
commit
b74007fed3
3 files changed
+5
-4
No files matched your search
@@ -1165,7 +1165,7 @@ impl super::Validator {
|
||||
// WorkGroupUniformLoad
|
||||
.contains(TypeFlags::SIZED | TypeFlags::CONSTRUCTIBLE)
|
||||
{
|
||||
ShaderStages::COMPUTE
|
||||
ShaderStages::COMPUTE_LIKE
|
||||
} else {
|
||||
return Err(ExpressionError::InvalidWorkGroupUniformLoadResultType(ty));
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user