[PATCH v3 0/1] MR330: vkd3d-shader/hlsl: Add fwidth() function.

[Nikolay Sivov (＠nsivov)]

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

--
  v3: vkd3d-shader/hlsl: Add fwidth() function.
 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/330

[PATCH v3 1/1] vkd3d-shader/hlsl: Add fwidth() function.

[Nikolay Sivov]

From: Nikolay Sivov <nsivov(a)codeweavers.com>

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 Makefile.am                   |  1 +
 libs/vkd3d-shader/hlsl.y      | 28 ++++++++++++++++++++++++++++
 tests/hlsl/fwidth.shader_test | 26 ++++++++++++++++++++++++++
 3 files changed, 55 insertions(+)
 create mode 100644 tests/hlsl/fwidth.shader_test

diff --git a/Makefile.am b/Makefile.am
index e869df1f..adf53f7a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -93,6 +93,7 @@ vkd3d_shader_tests = \
 	tests/hlsl/function-overload.shader_test \
 	tests/hlsl/function-return.shader_test \
 	tests/hlsl/function.shader_test \
+	tests/hlsl/fwidth.shader_test \
 	tests/hlsl/gather-offset.shader_test \
 	tests/hlsl/gather.shader_test \
 	tests/hlsl/getdimensions.shader_test \
diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index fb6d485e..f961fa2e 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -2961,6 +2961,33 @@ static bool intrinsic_frac(struct hlsl_ctx *ctx,
     return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_FRACT, arg, loc);
 }
 
+static bool intrinsic_fwidth(struct hlsl_ctx *ctx,
+        const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
+{
+    struct hlsl_ir_function_decl *func;
+    struct hlsl_type *type;
+    char *body;
+
+    static const char template[] =
+            "%s fwidth(%s x)\n"
+            "{\n"
+            "    return abs(ddx(x)) + abs(ddy(x));\n"
+            "}";
+
+    if (!elementwise_intrinsic_float_convert_args(ctx, params, loc))
+        return false;
+    type = params->args[0]->data_type;
+
+    if (!(body = hlsl_sprintf_alloc(ctx, template, type->name, type->name)))
+        return false;
+    func = hlsl_compile_internal_function(ctx, "fwidth", body);
+    vkd3d_free(body);
+    if (!func)
+        return false;
+
+    return add_user_call(ctx, func, params, loc);
+}
+
 static bool intrinsic_ldexp(struct hlsl_ctx *ctx,
         const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
 {
@@ -3676,6 +3703,7 @@ intrinsic_functions[] =
     {"floor",                               1, true,  intrinsic_floor},
     {"fmod",                                2, true,  intrinsic_fmod},
     {"frac",                                1, true,  intrinsic_frac},
+    {"fwidth",                              1, true,  intrinsic_fwidth},
     {"ldexp",                               2, true,  intrinsic_ldexp},
     {"length",                              1, true,  intrinsic_length},
     {"lerp",                                3, true,  intrinsic_lerp},
diff --git a/tests/hlsl/fwidth.shader_test b/tests/hlsl/fwidth.shader_test
new file mode 100644
index 00000000..e302505f
--- /dev/null
+++ b/tests/hlsl/fwidth.shader_test
@@ -0,0 +1,26 @@
+[require]
+shader model >= 3.0
+
+[pixel shader]
+float4 main(float4 pos : sv_position) : sv_target
+{
+    // Shader models < 4 don't add 0.5 to sv_position, so this adjustment is required to get the
+    // same outputs.
+    pos.x = floor(pos.x) + 0.5;
+    pos.y = floor(pos.y) + 0.5;
+
+    pos /= 10.0;
+    float nonlinear = pos.x * pos.y - pos.x * (pos.x + 0.5);
+    float4 res = fwidth(nonlinear);
+
+    // Each device may use either the coarse or the fine derivate, so use quantization.
+    return round(30 * res);
+}
+
+[test]
+draw quad
+probe (10, 10) rgba (8.0, 8.0, 8.0, 8.0)
+probe (11, 10) rgba (8.0, 8.0, 8.0, 8.0)
+probe (12, 10) rgba (10.0, 10.0, 10.0, 10.0)
+probe (16, 16) rgba (12.0, 12.0, 12.0, 12.0)
+probe (150, 150) rgba (92.0, 92.0, 92.0, 92.0)
-- 
GitLab

https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/330

[Nikolay Sivov (＠nsivov)]

On Thu Sep 14 08:41:10 2023 +0000, Nikolay Sivov wrote:
> changed this line in [version 3 of the diff](/wine/vkd3d/-/merge_requests/330/diffs?diff_id=69000&start_sha=7f5746a7e458d1dadbd2831af08f03ec9af59a0a#9155b9453b4ec8ea0b9b025dfb55c061bd931610_2975_2979)
> It follows the same pattern for float vs half, I pushed suggested change.

-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/330#note_45319

[PATCH v3 0/1] MR330: vkd3d-shader/hlsl: Add fwidth() function. - approved

[Giovanni Mascellani (＠giomasce)]

This merge request was approved by Giovanni Mascellani.
-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/330

[PATCH v3 0/1] MR330: vkd3d-shader/hlsl: Add fwidth() function. - approved

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.
-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/330

[PATCH v3 0/1] MR330: vkd3d-shader/hlsl: Add fwidth() function. - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.
-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/330