From 90b6412daa1a9901478775d3760b0c27663a14fb Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@locutus.nl>
Date: Wed, 28 May 2025 15:43:39 +0200
Subject: [PATCH] vkd3d-shader/msl: Implement VSIR_OP_UMAX and VSIR_OP_UMIN.

---
 libs/vkd3d-shader/msl.c                | 2 ++
 tests/hlsl/arithmetic-uint.shader_test | 2 +-
 tests/hlsl/max-min.shader_test         | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d-shader/msl.c b/libs/vkd3d-shader/msl.c
index 2a209323d..ec4dbacd3 100644
--- a/libs/vkd3d-shader/msl.c
+++ b/libs/vkd3d-shader/msl.c
@@ -1391,9 +1391,11 @@ static void msl_handle_instruction(struct msl_generator *gen, const struct vkd3d
             break;
         case VSIR_OP_IMAX:
         case VSIR_OP_MAX:
+        case VSIR_OP_UMAX:
             msl_intrinsic(gen, ins, "max");
             break;
         case VSIR_OP_MIN:
+        case VSIR_OP_UMIN:
             msl_intrinsic(gen, ins, "min");
             break;
         case VSIR_OP_IMUL_LOW:
diff --git a/tests/hlsl/arithmetic-uint.shader_test b/tests/hlsl/arithmetic-uint.shader_test
index b25dc4409..933c22dd0 100644
--- a/tests/hlsl/arithmetic-uint.shader_test
+++ b/tests/hlsl/arithmetic-uint.shader_test
@@ -86,7 +86,7 @@ float4 main() : SV_TARGET
 
 [test]
 uniform 0 uint 7
-todo(msl) draw quad
+draw quad
 probe (0, 0) rgba(38.0, 5.0, 7.0, 0.0)
 
 [rtv 0]
diff --git a/tests/hlsl/max-min.shader_test b/tests/hlsl/max-min.shader_test
index 67ce77f5c..46a813e6d 100644
--- a/tests/hlsl/max-min.shader_test
+++ b/tests/hlsl/max-min.shader_test
@@ -101,7 +101,7 @@ uint4 main() : sv_target
 
 [test]
 uniform 0 uint4 1 2 0 0
-todo(msl) draw quad
+draw quad
 probe (0, 0) u32(2, 1, 2, 1)
 
 [rtv 0]