Zebediah Figura : vkd3d-shader/hlsl: Write SM4 saturate instructions.
Alexandre Julliard
julliard at winehq.org
Fri Sep 17 15:56:54 CDT 2021
Module: vkd3d
Branch: master
Commit: 155812b1249ce3a3a0b21fc281baedae0c802b2f
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=155812b1249ce3a3a0b21fc281baedae0c802b2f
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Wed Sep 15 17:43:32 2021 -0500
vkd3d-shader/hlsl: Write SM4 saturate instructions.
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Giovanni Mascellani <gmascellani at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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 45db1a1..c9ad388 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 24c586c..8a1d363 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-cvs
mailing list