github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

[glsl-in] Add support for mix with bool selectors

Browse Source
This commit is contained in:
João Capucho
2021-06-20 20:16:55 +01:00
committed by Dzmitry Malyshau
parent c152205c87
commit ffe67139cd
1 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/front/glsl/functions.rs
View File

@@ -413,14 +413,42 @@ impl Program<'_> {
body,
)))
}
"mix" | "clamp" | "faceforward" | "refract" | "fma" | "smoothstep" => {
"mix" => {
if args.len() != 3 {
return Err(ErrorKind::wrong_function_args(name, 3, args.len(), meta));
}
Ok(Some(
if let Some(ScalarKind::Bool) =
self.resolve_type(ctx, args[2].0, args[2].1)?.scalar_kind()
{
ctx.add_expression(
Expression::Select {
condition: args[2].0,
accept: args[0].0,
reject: args[1].0,
},
body,
)
} else {
ctx.add_expression(
Expression::Math {
fun: MathFunction::Mix,
arg: args[0].0,
arg1: Some(args[1].0),
arg2: Some(args[2].0),
},
body,
)
},
))
}
"clamp" | "faceforward" | "refract" | "fma" | "smoothstep" => {
if args.len() != 3 {
return Err(ErrorKind::wrong_function_args(name, 3, args.len(), meta));
}
Ok(Some(ctx.add_expression(
Expression::Math {
fun: match name.as_str() {
"mix" => MathFunction::Mix,
"clamp" => MathFunction::Clamp,
"faceforward" => MathFunction::FaceForward,
"refract" => MathFunction::Refract,