From 5cf85621241832c89ce0b902564fb4451eae60bd Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Fri, 3 May 2024 15:43:42 +0200
Subject: [PATCH] vkd3d-shader/glsl: Implement VKD3DSIH_MIN.

---
 libs/vkd3d-shader/glsl.c            |  3 +++
 tests/hlsl/clamp.shader_test        |  2 +-
 tests/hlsl/inverse-trig.shader_test | 40 ++++++++++++++---------------
 tests/hlsl/max-min.shader_test      |  4 +--
 4 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c
index ddf489e9..9bceaae4 100644
--- a/libs/vkd3d-shader/glsl.c
+++ b/libs/vkd3d-shader/glsl.c
@@ -795,6 +795,9 @@ static void vkd3d_glsl_handle_instruction(struct vkd3d_glsl_generator *gen,
         case VKD3DSIH_MAX:
             shader_glsl_intrinsic(gen, ins, "max");
             break;
+        case VKD3DSIH_MIN:
+            shader_glsl_intrinsic(gen, ins, "min");
+            break;
         case VKD3DSIH_INE:
         case VKD3DSIH_NEU:
             shader_glsl_relop(gen, ins, "!=", "notEqual");
diff --git a/tests/hlsl/clamp.shader_test b/tests/hlsl/clamp.shader_test
index 3503dcfc..98666e2a 100644
--- a/tests/hlsl/clamp.shader_test
+++ b/tests/hlsl/clamp.shader_test
@@ -8,7 +8,7 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 -0.3 -0.1 0.7 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (-0.1, 0.7, -0.3, 0.3)
 
 
diff --git a/tests/hlsl/inverse-trig.shader_test b/tests/hlsl/inverse-trig.shader_test
index 32f95f54..dbf3ae4c 100644
--- a/tests/hlsl/inverse-trig.shader_test
+++ b/tests/hlsl/inverse-trig.shader_test
@@ -102,23 +102,23 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 -1.0 0.0 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (-0.785409629, 0.0, 0.0, 0.0) 512
 
 uniform 0 float4 -0.5 0.0 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (-0.4636476, 0.0, 0.0, 0.0) 256
 
 uniform 0 float4 0.0 0.0 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) 256
 
 uniform 0 float4 0.5 0.0 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.4636476, 0.0, 0.0, 0.0) 256
 
 uniform 0 float4 1.0 0.0 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.785409629, 0.0, 0.0, 0.0) 512
 
 [pixel shader]
@@ -133,64 +133,64 @@ float4 main() : sv_target
 [test]
 % Non-degenerate cases
 uniform 0 float4 1.0 1.0 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.785385, 0.0, 0.0, 0.0) 512
 
 uniform 0 float4 5.0 -5.0 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (2.356194, 0.0, 0.0, 0.0) 256
 
 uniform 0 float4 -3.0 -3.0 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (-2.356194, 0.0, 0.0, 0.0) 256
 
 uniform 0 float4 1.0 0.0 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.570796, 0.0, 0.0, 0.0) 256
 
 uniform 0 float4 -1.0 0.0 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (-1.570796, 0.0, 0.0, 0.0) 256
 
 uniform 0 float4 0.0 1.0 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) 256
 
 uniform 0 float4 0.0 -1.0 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (3.1415927, 0.0, 0.0, 0.0) 256
 
 % Degenerate cases
 uniform 0 float4 0.00001 0.00002 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.463647, 0.0, 0.0, 0.0) 256
 
 uniform 0 float4 0.00001 -0.00002 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (2.677945, 0.0, 0.0, 0.0) 256
 
 uniform 0 float4 -0.00001 100000.0 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (-0.000000000099986595, 0.0, 0.0, 0.0) 2048
 
 uniform 0 float4 10000000.0 0.00000001 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.570796, 0.0, 0.0, 0.0) 256
 
 % Negative zero behavior should be to treat it the
 % same as normal zero.
 uniform 0 float4 1000000000.0 0.0 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.570796, 0.0, 0.0, 0.0) 256
 
 uniform 0 float4 1000000000.0 -0.0 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (1.570796, 0.0, 0.0, 0.0) 256
 
 uniform 0 float4 0.0 -1.0 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (3.1415927, 0.0, 0.0, 0.0) 256
 
 uniform 0 float4 -0.0 -1.0 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (3.1415927, 0.0, 0.0, 0.0) 256
diff --git a/tests/hlsl/max-min.shader_test b/tests/hlsl/max-min.shader_test
index 2beb501a..e4ba2e40 100644
--- a/tests/hlsl/max-min.shader_test
+++ b/tests/hlsl/max-min.shader_test
@@ -64,7 +64,7 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 0.7 -0.1 0.0 0.0
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (-0.1, 2.0, 1.0, -2.0)
 
 
@@ -80,7 +80,7 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 0.7 -0.1 0.4 0.8
-todo(glsl) draw quad
+draw quad
 probe (0, 0) rgba (0.4, -0.1, -0.2, -0.1)