From: Zebediah Figura Subject: [PATCH vkd3d 4/6] vkd3d-shader/hlsl: Write SM4 min instructions. Message-Id: <20210915224332.71963-4-zfigura@codeweavers.com> Date: Wed, 15 Sep 2021 17:43:30 -0500 In-Reply-To: <20210915224332.71963-1-zfigura@codeweavers.com> References: <20210915224332.71963-1-zfigura@codeweavers.com> Signed-off-by: Zebediah Figura --- 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 c745dbab1..67dcbba4e 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 08828b81d..24c586c20 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; -- 2.33.0