Re: [PATCH v3 vkd3d 1/3] vkd3d-shader/hlsl: Cast round() input to float.

[Giovanni Mascellani]

Signed-off-by: Giovanni Mascellani

On 07/01/22 14:04, Nikolay Sivov wrote:
> Signed-off-by: Nikolay Sivov
>
> v3: handle conversion failures
>
> libs/vkd3d-shader/hlsl.y    | 19 ++++++++++++++++++-
>   tests/round.shader_test     | 13 +++++++++++++
>   tests/shader_runner_d3d12.c | 13 +++++++++++++
>   3 files changed, 44 insertions(+), 1 deletion(-)
>
> diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
> index 636882c..6c285c3 100644
> --- a/libs/vkd3d-shader/hlsl.y
> +++ b/libs/vkd3d-shader/hlsl.y
> @@ -1570,6 +1570,18 @@ static const struct hlsl_ir_function_decl *find_function_call(struct hlsl_ctx *c
>       return args.decl;
>   }
>
> +static struct hlsl_ir_node *intrinsic_float_convert_arg(struct hlsl_ctx *ctx,
> -
>    const struct parse_initializer *params, struct hlsl_ir_node *arg, const struct vkd3d_shader_location *loc)
>
> +{
> - struct hlsl_type *type = arg->data_type;
> -
> - if (type->base_type == HLSL_TYPE_FLOAT || type->base_type == HLSL_TYPE_HALF)
> -
>    return arg;
> -
> - type = hlsl_get_numeric_type(ctx, type->type, HLSL_TYPE_FLOAT, type->dimx, type->dimy);
> - return add_implicit_conversion(ctx, params->instrs, arg, type, loc);
>
> +}
> - static bool intrinsic_abs(struct hlsl_ctx *ctx,
>         const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
> {
>
> @@ -1675,7 +1687,12 @@ static bool intrinsic_pow(struct hlsl_ctx *ctx,
>   static bool intrinsic_round(struct hlsl_ctx *ctx,
>           const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
>   {
> - return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_ROUND, params->args[0], loc);
> -
>
> struct hlsl_ir_node *arg;
> -
> -
>
> if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc)))
> -
>    return false;
> -
> -
>
> return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_ROUND, arg, loc);
> }
>
> static bool intrinsic_saturate(struct hlsl_ctx *ctx,
>
> diff --git a/tests/round.shader_test b/tests/round.shader_test
> index d8eb11b..cc5a697 100644
> --- a/tests/round.shader_test
> +++ b/tests/round.shader_test
> @@ -24,3 +24,16 @@ float4 main(uniform float4 u) : sv_target
>   uniform 0 float4 -0.5 6.5 7.5 3.4
>   draw quad
>   probe all rgba (6.0, 8.0, 0.0, 3.0) 4
> -
> -
> -
>
> +[pixel shader]
> +float4 main(uniform int4 u) : sv_target
> +{
> - return round(u);
>
> +}
> -
>
> +[test]
> +uniform 0 int4 -1 0 2 10
> +draw quad
> +probe all rgba (-1.0, 0.0, 2.0, 10.0) 4
> diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c
> index 47f419b..c5992aa 100644
> --- a/tests/shader_runner_d3d12.c
> +++ b/tests/shader_runner_d3d12.c
> @@ -552,6 +552,19 @@ static void parse_test_directive(struct shader_context *context, const char *lin
>               }
>               memcpy(context->uniforms + offset, &i, sizeof(i));
>           }
> -
>    if (match_string(line, "int4", &line))
> -
>    {
> -
>        int v[4];
> -
> -
>        if (sscanf(line, "%d %d %d %d", &v[0], &v[1], &v[2], &v[3]) < 4)
> -
>            fatal_error("Malformed int4 constant '%s'.\n", line);
> -
>        if (offset + 4 > context->uniform_count)
> -
>        {
> -
>            context->uniform_count = offset + 4;
> -
>            context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms));
> -
>        }
> -
>        memcpy(context->uniforms + offset, v, sizeof(v));
> -
>    }
>     else if (match_string(line, "uint", &line))
>     {
>         unsigned int u;