Conor McCarthy : tests/shader-runner: Add a test for FCMP_ORD (is ordered).

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 94583815bc72df9c53c9c45df1616467d48c5358
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/94583815bc72df9c53c9c45df16164...

Author: Conor McCarthy <cmccarthy(a)codeweavers.com>
Date:   Tue Mar  5 00:36:57 2024 +1000

tests/shader-runner: Add a test for FCMP_ORD (is ordered).

---

 tests/hlsl/float-comparison.shader_test | 33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/tests/hlsl/float-comparison.shader_test b/tests/hlsl/float-comparison.shader_test
index b6654344..0a3e56f8 100644
--- a/tests/hlsl/float-comparison.shader_test
+++ b/tests/hlsl/float-comparison.shader_test
@@ -32,41 +32,26 @@ float4 main() : sv_target
     result.z += (n != f.y)    ?   100000.0 : 0.0;
     result.z += !(n == f.y)   ?  1000000.0 : 0.0;
     result.z += !(n != f.y)   ? 10000000.0 : 0.0;
-    /* It doesn't seem possible to generate DXIL instructions for 'is ordered' or 'is unordered'.
-     * Expressions 'isnan(n)' and '(isnan(n) || isnan(f.x))' compile into intrinsics. */
-    result.w = 0;
+    // These compile to FCMP_ORD, but prepending a ! does not result in FCMP_UNO
+    result.w  = (f.y < f.x || f.y >= f.x) ?  1.0 : 0.0;
+    result.w += (n < f.x || n >= f.x)     ? 10.0 : 0.0;
     return result;
 }
 
-% SM1-3 apparently treats '0/0' as zero.
-[require]
-shader model < 4.0
-
 [test]
 uniform 0 float4 0.0 1.5 1.5 0.0
-todo(sm<4) draw quad
-todo probe all rgba (1010101.0, 11001100.0, 1101001.0, 0.0)
-
+todo(sm<4 | sm>=6) draw quad
+% SM1-3 apparently treats '0/0' as zero.
+if(sm<4) todo probe all rgba (1010101.0, 11001100.0, 1101001.0, 11.0)
 % SM4-5 optimises away the 'not' by inverting the condition, even though this is invalid for NaN.
-[require]
-shader model >= 4.0
-shader model < 6.0
+if(sm>=4 & sm<6) todo probe all rgba (1010101.0, 0.0, 1101001.0, 1.0)
+% SM6 emits the correct ordered/unordered instructions, so comparisons are false for NaN, and are made true with 'not'.
+if(sm>=6) probe all rgba (1010101.0, 11110000.0, 1101001.0, 1.0)
 
-[test]
-uniform 0 float4 0.0 1.5 1.5 0.0
-draw quad
-todo probe all rgba (1010101.0, 0.0, 1101001.0, 0.0)
 
-% SM6 emits the correct ordered/unordered instructions, so comparisons are false for NaN, and are made true with 'not'.
 [require]
 shader model >= 6.0
 
-[test]
-uniform 0 float4 0.0 1.5 1.5 0.0
-draw quad
-probe all rgba (1010101.0, 11110000.0, 1101001.0, 0.0)
-
-
 [pixel shader]
 uniform float4 f;