[PATCH v6 2/2] vkd3d-shader/hlsl: Implement D3DCOLORtoUBYTE4() function.

[Nikolay Sivov]

From: Nikolay Sivov

---
 Makefile.am                               |  1 +
 libs/vkd3d-shader/hlsl.y                  | 46 +++++++++++++++++++++++
 tests/hlsl-d3dcolor-to-ubyte4.shader_test | 24 ++++++++++++
 3 files changed, 71 insertions(+)
 create mode 100644 tests/hlsl-d3dcolor-to-ubyte4.shader_test

diff --git a/Makefile.am b/Makefile.am
index a968e2c3..4ef73404 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,6 +76,7 @@ vkd3d_shader_tests = \
    tests/hlsl-clamp.shader_test \
    tests/hlsl-comma.shader_test \
    tests/hlsl-cross.shader_test \
+	tests/hlsl-d3dcolor-to-ubyte4.shader_test \
    tests/hlsl-discard.shader_test \
    tests/hlsl-dot.shader_test \
    tests/hlsl-duplicate-modifiers.shader_test \
diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 1a8d319a..3846121e 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -3373,6 +3373,51 @@ static bool intrinsic_trunc(struct hlsl_ctx *ctx,
     return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_TRUNC, arg, loc);
 }

+static bool intrinsic_d3dcolor_to_ubyte4(struct hlsl_ctx *ctx,
+        const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
+{
+    struct hlsl_ir_node *arg = params->args[0], *ret, *c;
+    struct hlsl_type *arg_type = arg->data_type;
+    struct hlsl_ir_swizzle *swizzle;
+
+    if (arg_type->class != HLSL_CLASS_SCALAR && !(arg_type->class == HLSL_CLASS_VECTOR && arg_type->dimx == 4))
+    {
+        struct vkd3d_string_buffer *string;
+
+        if ((string = hlsl_type_to_string(ctx, arg_type)))
+        {
+            hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Wrong argument type '%s'.", string->buffer);
+            hlsl_release_string_buffer(ctx, string);
+        }
+
+        return false;
+    }
+
+    if (!(arg = intrinsic_float_convert_arg(ctx, params, arg, loc)))
+        return false;
+
+    if (!(c = hlsl_new_float_constant(ctx, 255.0f + (0.5f / 256.0f), loc)))
+        return false;
+    list_add_tail(params->instrs, &c->entry);
+
+    if (arg_type->class == HLSL_CLASS_VECTOR)
+    {
+        if (!(swizzle = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(Z, Y, X, W), 4, arg, loc)))
+            return false;
+        list_add_tail(params->instrs, &swizzle->node.entry);
+
+        arg = &swizzle->node;
+    }
+
+    if (!(ret = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, arg, c, loc)))
+        return false;
+
+    if (ctx->profile->major_version >= 4)
+        return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_TRUNC, ret, loc);
+
+    return true;
+}
+
 static const struct intrinsic_function
 {
     const char *name;
@@ -3384,6 +3429,7 @@ static const struct intrinsic_function
 intrinsic_functions[] =
 {
     /* Note: these entries should be kept in alphabetical order. */
+    {"D3DCOLORtoUBYTE4",                    1, true,  intrinsic_d3dcolor_to_ubyte4},
     {"abs",                                 1, true,  intrinsic_abs},
     {"all",                                 1, true,  intrinsic_all},
     {"any",                                 1, true,  intrinsic_any},
diff --git a/tests/hlsl-d3dcolor-to-ubyte4.shader_test b/tests/hlsl-d3dcolor-to-ubyte4.shader_test
new file mode 100644
index 00000000..e31ef61c
--- /dev/null
+++ b/tests/hlsl-d3dcolor-to-ubyte4.shader_test
@@ -0,0 +1,24 @@
+[require]
+shader model >= 4.0
+
+[pixel shader]
+float4 main(uniform float4 u) : sv_target
+{
+    return D3DCOLORtoUBYTE4(u);
+}
+
+[test]
+uniform 0 float4 -0.5 6.5 7.5 3.4
+draw quad
+probe all rgba (1912.0, 1657.0, -127.0, 867.0) 1
+
+[pixel shader]
+float4 main(uniform float4 u) : sv_target
+{
+    return D3DCOLORtoUBYTE4(u.x);
+}
+
+[test]
+uniform 0 float4 -0.5 6.5 7.5 3.4
+draw quad
+probe all rgba (-127.0, -127.0, -127.0, -127.0) 1