Nikolay Sivov : vkd3d-shader/hlsl: Support distance() intrinsic.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: a18f3d4dd5a1b8921067db4a88a587002cb1a8ff
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/a18f3d4dd5a1b8921067db4a88a587...

Author: Nikolay Sivov 
Date:   Mon Jan 30 11:13:33 2023 +0300

vkd3d-shader/hlsl: Support distance() intrinsic.

---

Makefile.am                |  1 +
 libs/vkd3d-shader/hlsl.y   | 24 ++++++++++++++++++++++++
 tests/distance.shader_test | 23 +++++++++++++++++++++++
 3 files changed, 48 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 29692432..191f4eb9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,6 +61,7 @@ vkd3d_shader_tests = \
    tests/cbuffer.shader_test \
    tests/compute.shader_test \
    tests/conditional.shader_test \
+	tests/distance.shader_test \
    tests/entry-point-semantics.shader_test \
    tests/exp.shader_test \
    tests/floor.shader_test \
diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 10ac3179..e50d1862 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -2533,6 +2533,29 @@ static bool intrinsic_cross(struct hlsl_ctx *ctx,
     return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, mul2, mul1_neg, loc);
 }

+static bool intrinsic_distance(struct hlsl_ctx *ctx,
+        const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
+{
+    struct hlsl_ir_node *arg1, *arg2, *neg, *add, *dot;
+
+    if (!(arg1 = intrinsic_float_convert_arg(ctx, params, params->args[0], loc)))
+        return false;
+
+    if (!(arg2 = intrinsic_float_convert_arg(ctx, params, params->args[1], loc)))
+        return false;
+
+    if (!(neg = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_NEG, arg2, loc)))
+        return false;
+
+    if (!(add = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, arg1, neg, loc)))
+        return false;
+
+    if (!(dot = add_binary_dot_expr(ctx, params->instrs, add, add, loc)))
+        return false;
+
+    return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_SQRT, dot, loc);
+}
+
 static bool intrinsic_dot(struct hlsl_ctx *ctx,
         const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
 {
@@ -3203,6 +3226,7 @@ intrinsic_functions[] =
     {"clamp",                               3, true,  intrinsic_clamp},
     {"cos",                                 1, true,  intrinsic_cos},
     {"cross",                               2, true,  intrinsic_cross},
+    {"distance",                            2, true,  intrinsic_distance},
     {"dot",                                 2, true,  intrinsic_dot},
     {"exp",                                 1, true,  intrinsic_exp},
     {"exp2",                                1, true,  intrinsic_exp2},
diff --git a/tests/distance.shader_test b/tests/distance.shader_test
new file mode 100644
index 00000000..3f544645
--- /dev/null
+++ b/tests/distance.shader_test
@@ -0,0 +1,23 @@
+[pixel shader]
+uniform float4 x;
+uniform float4 y;
+
+float4 main() : sv_target
+{
+    return distance(x, y);
+}
+
+[test]
+uniform 0 float4 -2.0 3.0 4.0 0.1
+uniform 4 float4 2.0 -1.0 4.0 5.0
+draw quad
+probe all rgba (7.483983, 7.483983, 7.483983, 7.483983) 1
+
+[pixel shader]
+uniform int4 x;
+uniform int4 y;
+
+float4 main() : sv_target
+{
+    return distance(x, y);
+}