[PATCH vkd3d 6/6] vkd3d-shader/hlsl: Write SM4 saturate instructions.

Giovanni Mascellani gmascellani at codeweavers.com
Thu Sep 16 06:41:28 CDT 2021


Signed-off-by: Giovanni Mascellani <gmascellani at codeweavers.com>

Il 16/09/21 00:43, Zebediah Figura ha scritto:
> Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
> ---
>   Makefile.am                  | 1 -
>   libs/vkd3d-shader/hlsl_sm4.c | 6 ++++++
>   2 files changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index 45db1a16d..c9ad38893 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -296,7 +296,6 @@ XFAIL_TESTS = \
>   	tests/hlsl-vector-indexing-uniform.shader_test \
>   	tests/math.shader_test \
>   	tests/max.shader_test \
> -	tests/saturate.shader_test \
>   	tests/trigonometry.shader_test \
>   	tests/writemask-assignop-1.shader_test
>   endif
> diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c
> index 24c586c20..8a1d36322 100644
> --- a/libs/vkd3d-shader/hlsl_sm4.c
> +++ b/libs/vkd3d-shader/hlsl_sm4.c
> @@ -1023,6 +1023,12 @@ static void write_sm4_expr(struct hlsl_ctx *ctx,
>                       write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV, &expr->node, arg1, VKD3D_SM4_REGISTER_MODIFIER_NEGATE);
>                       break;
>   
> +                case HLSL_OP1_SAT:
> +                    write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV
> +                            | (VKD3D_SM4_INSTRUCTION_FLAG_SATURATE << VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT),
> +                            &expr->node, arg1, 0);
> +                    break;
> +
>                   case HLSL_OP2_ADD:
>                       write_sm4_binary_op(buffer, VKD3D_SM4_OP_ADD, &expr->node, arg1, arg2);
>                       break;
> 



More information about the wine-devel mailing list