Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add glsl barrier function #1793

Merged
merged 2 commits into from
Mar 28, 2022
Merged

Add glsl barrier function #1793

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27279b2
Add glsl barrier function
fintelia Mar 27, 2022
7dfcb92
Call ctx.emit_start after flushing
fintelia Mar 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/front/glsl/builtins.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,6 +995,9 @@ fn inject_standard_builtins(
.push(module.add_builtin(args, MacroCall::Clamp(size)))
}
}
"barrier" => declaration
.overloads
.push(module.add_builtin(Vec::new(), MacroCall::Barrier)),
// Add common builtins with floats
_ => inject_common_builtin(declaration, module, name, 4),
}
Expand Down Expand Up @@ -1587,6 +1590,7 @@ pub enum MacroCall {
Clamp(Option<VectorSize>),
BitCast(Sk),
Derivate(DerivativeAxis),
Barrier,
}

impl MacroCall {
Expand Down Expand Up @@ -1992,6 +1996,12 @@ impl MacroCall {
Span::default(),
body,
),
MacroCall::Barrier => {
ctx.emit_flush(body);
fintelia marked this conversation as resolved.
Show resolved Hide resolved
ctx.emit_start();
body.push(crate::Statement::Barrier(crate::Barrier::all()), meta);
return Ok(None);
}
}))
}
}
Expand Down