diff --git a/CHANGELOG.md b/CHANGELOG.md
index a87770b5ab..c08bf98dfc 100644
--- 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
index 8a69acc820..062209a4e6 100644
--- 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()]) })
             }