Ethan Lee : vkd3d-shader/hlsl: Add support for sign() intrinsic.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 5d735f3b0ee2074344cea16bc0d44e88d8da3351
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/5d735f3b0ee2074344cea16bc0d44e...

Author: Ethan Lee <flibitijibibo(a)gmail.com>
Date:   Fri Apr 21 16:13:37 2023 -0400

vkd3d-shader/hlsl: Add support for sign() intrinsic.

Signed-off-by: Ethan Lee <flibitijibibo(a)gmail.com>

---

 libs/vkd3d-shader/hlsl.y | 37 ++++++++++++++++++++++++++++++++++
 tests/sign.shader_test   | 52 ++++++++++++++++++++++++------------------------
 2 files changed, 63 insertions(+), 26 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 27663a0d..1ba929b5 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -3165,6 +3165,42 @@ static bool intrinsic_saturate(struct hlsl_ctx *ctx,
     return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_SAT, arg, loc);
 }
 
+static bool intrinsic_sign(struct hlsl_ctx *ctx,
+        const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
+{
+    struct hlsl_ir_node *lt, *neg, *op1, *op2, *arg = params->args[0];
+    struct hlsl_ir_constant *zero;
+
+    struct hlsl_type *int_type = hlsl_get_numeric_type(ctx, arg->data_type->class, HLSL_TYPE_INT,
+            arg->data_type->dimx, arg->data_type->dimy);
+
+    if (!(zero = hlsl_new_constant(ctx, hlsl_get_scalar_type(ctx, arg->data_type->base_type), loc)))
+        return false;
+    list_add_tail(params->instrs, &zero->node.entry);
+
+    /* Check if 0 < arg, cast bool to int */
+
+    if (!(lt = add_binary_comparison_expr(ctx, params->instrs, HLSL_OP2_LESS, &zero->node, arg, loc)))
+        return false;
+
+    if (!(op1 = add_implicit_conversion(ctx, params->instrs, lt, int_type, loc)))
+        return false;
+
+    /* Check if arg < 0, cast bool to int and invert (meaning true is -1) */
+
+    if (!(lt = add_binary_comparison_expr(ctx, params->instrs, HLSL_OP2_LESS, arg, &zero->node, loc)))
+        return false;
+
+    if (!(op2 = add_implicit_conversion(ctx, params->instrs, lt, int_type, loc)))
+        return false;
+
+    if (!(neg = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_NEG, op2, loc)))
+        return false;
+
+    /* Adding these two together will make 1 when > 0, -1 when < 0, and 0 when neither */
+    return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, neg, op1, loc);
+}
+
 static bool intrinsic_sin(struct hlsl_ctx *ctx,
         const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
 {
@@ -3483,6 +3519,7 @@ intrinsic_functions[] =
     {"round",                               1, true,  intrinsic_round},
     {"rsqrt",                               1, true,  intrinsic_rsqrt},
     {"saturate",                            1, true,  intrinsic_saturate},
+    {"sign",                                1, true,  intrinsic_sign},
     {"sin",                                 1, true,  intrinsic_sin},
     {"smoothstep",                          3, true,  intrinsic_smoothstep},
     {"sqrt",                                1, true,  intrinsic_sqrt},
diff --git a/tests/sign.shader_test b/tests/sign.shader_test
index dc1a557f..7ed632db 100644
--- a/tests/sign.shader_test
+++ b/tests/sign.shader_test
@@ -1,4 +1,4 @@
-[pixel shader notimpl]
+[pixel shader]
 uniform float f;
 
 float4 main() : sv_target
@@ -8,16 +8,16 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 1.0 0.0 0.0 0.0
-todo draw quad
-todo probe all rgba (1.0, 1.0, 1.0, 1.0)
+draw quad
+probe all rgba (1.0, 1.0, 1.0, 1.0)
 uniform 0 float4 -1.0 0.0 0.0 0.0
-todo draw quad
-todo probe all rgba (-1.0, -1.0, -1.0, -1.0)
+draw quad
+probe all rgba (-1.0, -1.0, -1.0, -1.0)
 uniform 0 float4 0.0 0.0 0.0 0.0
-todo draw quad
-todo probe all rgba (0.0, 0.0, 0.0, 0.0)
+draw quad
+probe all rgba (0.0, 0.0, 0.0, 0.0)
 
-[pixel shader notimpl]
+[pixel shader]
 uniform float4 f;
 
 float4 main() : sv_target
@@ -27,10 +27,10 @@ float4 main() : sv_target
 
 [test]
 uniform 0 float4 1.0 2.0 3.0 4.0
-todo draw quad
-todo probe all rgba (1.0, 1.0, 1.0, 1.0)
+draw quad
+probe all rgba (1.0, 1.0, 1.0, 1.0)
 
-[pixel shader notimpl]
+[pixel shader]
 uniform float2x2 f;
 
 float4 main() : sv_target
@@ -41,10 +41,10 @@ float4 main() : sv_target
 [test]
 uniform 0 float4 1.0 2.0 0.0 0.0
 uniform 4 float4 3.0 4.0 0.0 0.0
-todo draw quad
-todo probe all rgba (1.0, 1.0, 1.0, 1.0)
+draw quad
+probe all rgba (1.0, 1.0, 1.0, 1.0)
 
-[pixel shader notimpl]
+[pixel shader]
 uniform int f;
 
 float4 main() : sv_target
@@ -54,16 +54,16 @@ float4 main() : sv_target
 
 [test]
 uniform 0 int4 1 0 0 0
-todo draw quad
-todo probe all rgba (1, 1, 1, 1)
+draw quad
+probe all rgba (1, 1, 1, 1)
 uniform 0 int4 -1 0 0 0
-todo draw quad
-todo probe all rgba (-1, -1, -1, -1)
+draw quad
+probe all rgba (-1, -1, -1, -1)
 uniform 0 int4 0 0 0 0
-todo draw quad
-todo probe all rgba (0, 0, 0, 0)
+draw quad
+probe all rgba (0, 0, 0, 0)
 
-[pixel shader notimpl]
+[pixel shader]
 uniform int4 f;
 
 float4 main() : sv_target
@@ -73,10 +73,10 @@ float4 main() : sv_target
 
 [test]
 uniform 0 int4 1 2 3 4
-todo draw quad
-todo probe all rgba (1, 1, 1, 1)
+draw quad
+probe all rgba (1, 1, 1, 1)
 
-[pixel shader notimpl]
+[pixel shader]
 uniform int2x2 f;
 
 float4 main() : sv_target
@@ -87,5 +87,5 @@ float4 main() : sv_target
 [test]
 uniform 0 int4 1 2 0 0
 uniform 4 int4 3 4 0 0
-todo draw quad
-todo probe all rgba (1, 1, 1, 1)
+draw quad
+probe all rgba (1, 1, 1, 1)