Zebediah Figura : vkd3d-shader/hlsl: Write SM4 min instructions.
Alexandre Julliard
julliard at winehq.org
Fri Sep 17 15:56:54 CDT 2021
Module: vkd3d
Branch: master
Commit: 4ecdd280ac75ad02dc85f3aec2723225a83f575c
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4ecdd280ac75ad02dc85f3aec2723225a83f575c
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Wed Sep 15 17:43:30 2021 -0500
vkd3d-shader/hlsl: Write SM4 min instructions.
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Giovanni Mascellani <gmascellani at codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
Makefile.am | 1 -
libs/vkd3d-shader/hlsl_sm4.c | 4 ++++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index c745dba..67dcbba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -279,7 +279,6 @@ XFAIL_TESTS = \
tests/conditional.shader_test \
tests/hlsl-array-dimension.shader_test \
tests/hlsl-bool-cast.shader_test \
- tests/hlsl-clamp.shader_test \
tests/hlsl-comma.shader_test \
tests/hlsl-duplicate-modifiers.shader_test \
tests/hlsl-for.shader_test \
diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c
index 08828b8..24c586c 100644
--- a/libs/vkd3d-shader/hlsl_sm4.c
+++ b/libs/vkd3d-shader/hlsl_sm4.c
@@ -1035,6 +1035,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx,
write_sm4_binary_op(buffer, VKD3D_SM4_OP_MAX, &expr->node, arg1, arg2);
break;
+ case HLSL_OP2_MIN:
+ write_sm4_binary_op(buffer, VKD3D_SM4_OP_MIN, &expr->node, arg1, arg2);
+ break;
+
case HLSL_OP2_MUL:
write_sm4_binary_op(buffer, VKD3D_SM4_OP_MUL, &expr->node, arg1, arg2);
break;
More information about the wine-cvs
mailing list