nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-25 08:13:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor WGSL atomic writing (#5534)

Browse Source
This commit is contained in:
vero 2024-04-18 01:57:35 -07:00 committed by GitHub
parent 638fc9db7f
commit 163ffa6d63
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
naga/src/front/wgsl/lower/mod.rs
View File

@ -2085,6 +2085,8 @@ impl<'source, 'temp> Lowerer<'source, 'temp> {
return Ok(Some(
self.subgroup_gather_helper(span, mode, arguments, ctx)?,
));
} else if let Some(fun) = crate::AtomicFunction::map(function.name) {
return Ok(Some(self.atomic_helper(span, fun, arguments, ctx)?));
} else {
match function.name {
"select" => {
@ -2130,70 +2132,6 @@ impl<'source, 'temp> Lowerer<'source, 'temp> {
.push(crate::Statement::Store { pointer, value }, span);
return Ok(None);
}
"atomicAdd" => {
return Ok(Some(self.atomic_helper(
span,
crate::AtomicFunction::Add,
arguments,
ctx,
)?))
}
"atomicSub" => {
return Ok(Some(self.atomic_helper(
span,
crate::AtomicFunction::Subtract,
arguments,
ctx,
)?))
}
"atomicAnd" => {
return Ok(Some(self.atomic_helper(
span,
crate::AtomicFunction::And,
arguments,
ctx,
)?))
}
"atomicOr" => {
return Ok(Some(self.atomic_helper(
span,
crate::AtomicFunction::InclusiveOr,
arguments,
ctx,
)?))
}
"atomicXor" => {
return Ok(Some(self.atomic_helper(
span,
crate::AtomicFunction::ExclusiveOr,
arguments,
ctx,
)?))
}
"atomicMin" => {
return Ok(Some(self.atomic_helper(
span,
crate::AtomicFunction::Min,
arguments,
ctx,
)?))
}
"atomicMax" => {
return Ok(Some(self.atomic_helper(
span,
crate::AtomicFunction::Max,
arguments,
ctx,
)?))
}
"atomicExchange" => {
return Ok(Some(self.atomic_helper(
span,
crate::AtomicFunction::Exchange { compare: None },
arguments,
ctx,
)?))
}
"atomicCompareExchangeWeak" => {
let mut args = ctx.prepare_args(arguments, 3, span);
@ -3006,3 +2944,19 @@ impl<'source, 'temp> Lowerer<'source, 'temp> {
}
}
}
impl crate::AtomicFunction {
pub fn map(word: &str) -> Option<Self> {
Some(match word {
"atomicAdd" => crate::AtomicFunction::Add,
"atomicSub" => crate::AtomicFunction::Subtract,
"atomicAnd" => crate::AtomicFunction::And,
"atomicOr" => crate::AtomicFunction::InclusiveOr,
"atomicXor" => crate::AtomicFunction::ExclusiveOr,
"atomicMin" => crate::AtomicFunction::Min,
"atomicMax" => crate::AtomicFunction::Max,
"atomicExchange" => crate::AtomicFunction::Exchange { compare: None },
_ => return None,
})
}
}