feat(const_eval): impl. max

ErichDonGubler · ErichDonGubler · commit 7d41f29cf2cd · 2024-01-29T17:52:34.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
@@ -956,6 +956,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
`@@ -956,6 +956,11 @@ impl<'a> ConstantEvaluator<'a> {`
`956`	`956`	`crate::MathFunction::Log2 => {`
`957`	`957`	`component_wise_float!(self, span, [arg], \|e\| { Ok([e.log2()]) })`
`958`	`958`	`}`
	`959`	`+ crate::MathFunction::Max => {`
	`960`	`+ component_wise_scalar!(self, span, [arg, arg1.unwrap()], \|e1, e2\| {`
	`961`	`+ Ok([e1.max(e2)])`
	`962`	`+ })`
	`963`	`+ }`
`959`	`964`	`crate::MathFunction::Radians => {`
`960`	`965`	`component_wise_float!(self, span, [arg], \|e1\| { Ok([e1.to_radians()]) })`
`961`	`966`	`}`