feat(const_eval): impl. max

ErichDonGubler · ErichDonGubler · commit 224585ed09d0 · 2024-01-26T12:28:00.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -80,6 +80,7 @@ Bottom level categories:
         - `inverseSqrt`
         - `log`
         - `log2`
+        - `max`
         - `radians`
         - `reverseBits`
         - `sign`
diff --git a/naga/src/proc/constant_evaluator.rs b/naga/src/proc/constant_evaluator.rs
@@ -952,6 +952,11 @@ impl<'a> ConstantEvaluator<'a> {
             crate::MathFunction::Log2 => {
                 component_wise_float!(self, span, [arg], |e| { Ok([e.log2()]) })
             }
+            crate::MathFunction::Max => {
+                component_wise_scalar!(self, span, [arg, arg1.unwrap()], |e1, e2| {
+                    Ok([e1.max(e2)])
+                })
+            }
             crate::MathFunction::Radians => {
                 component_wise_float!(self, span, [arg], |e1| { Ok([e1.to_radians()]) })
             }

Original file line number	Diff line number	Diff line change
`@@ -952,6 +952,11 @@ impl<'a> ConstantEvaluator<'a> {`
`952`	`952`	`crate::MathFunction::Log2 => {`
`953`	`953`	`component_wise_float!(self, span, [arg], \|e\| { Ok([e.log2()]) })`
`954`	`954`	`}`
	`955`	`+ crate::MathFunction::Max => {`
	`956`	`+ component_wise_scalar!(self, span, [arg, arg1.unwrap()], \|e1, e2\| {`
	`957`	`+ Ok([e1.max(e2)])`
	`958`	`+ })`
	`959`	`+ }`
`955`	`960`	`crate::MathFunction::Radians => {`
`956`	`961`	`component_wise_float!(self, span, [arg], \|e1\| { Ok([e1.to_radians()]) })`
`957`	`962`	`}`