From 64ea19b7f71f45112cd8b644dc54a1b08f65f0dc Mon Sep 17 00:00:00 2001 From: Feifan He Date: Fri, 22 Nov 2024 15:45:54 +0800 Subject: [PATCH] vkd3d-shader/msl: Implement VKD3DSIH_DIV. --- libs/vkd3d-shader/msl.c | 3 +++ .../hlsl/arithmetic-float-uniform.shader_test | 2 +- tests/hlsl/rcp.shader_test | 20 +++++++++---------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/msl.c b/libs/vkd3d-shader/msl.c index e08b1a36..d4dc1893 100644 --- a/libs/vkd3d-shader/msl.c +++ b/libs/vkd3d-shader/msl.c @@ -445,6 +445,9 @@ static void msl_handle_instruction(struct msl_generator *gen, const struct vkd3d case VKD3DSIH_DCL_OUTPUT_SIV: case VKD3DSIH_NOP: break; + case VKD3DSIH_DIV: + msl_binop(gen, ins, "/"); + break; case VKD3DSIH_INE: case VKD3DSIH_NEU: msl_relop(gen, ins, "!="); diff --git a/tests/hlsl/arithmetic-float-uniform.shader_test b/tests/hlsl/arithmetic-float-uniform.shader_test index 92b23bed..f4c1a7b9 100644 --- a/tests/hlsl/arithmetic-float-uniform.shader_test +++ b/tests/hlsl/arithmetic-float-uniform.shader_test @@ -88,7 +88,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 1.0 0.0 0.0 0.0 -todo(msl) draw quad +draw quad probe (0, 0) rgba (1e99, 1e99, 1e99, 1e99) [pixel shader] diff --git a/tests/hlsl/rcp.shader_test b/tests/hlsl/rcp.shader_test index 3166de83..51753d19 100644 --- a/tests/hlsl/rcp.shader_test +++ b/tests/hlsl/rcp.shader_test @@ -8,24 +8,24 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.0, 0.5, 0.3333333, 0.25) 8 uniform 0 float4 -1.0 -2.0 -3.0 -4.0 -todo(msl) draw quad +draw quad probe (0, 0) rgba (-1.0, -0.5, -0.3333333, -0.25) 8 uniform 0 float4 12.34 56.78 -90.12 -34.56 -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.081037275, 0.017611835, -0.011096316, -0.028935184) 8 uniform 0 float4 0.25 0.125 0.0625 0.3333333 -todo(msl) draw quad +draw quad probe (0, 0) rgba (4.0, 8.0, 16.0, 3.0) 8 % Degenerate cases uniform 0 float4 0.0 -0.0 1.0e39 -1.0e39 -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.0e39, -1.0e39, 0.0, -0.0) 8 @@ -40,15 +40,15 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) 8 uniform 0 float4 7.604 3.1415 2.72 9.876 -todo(msl) draw quad +draw quad probe (0, 0) rgba (7.604, 3.1415, 2.72, 9.876) 8 uniform 0 float4 0.0 -0.0 1.0e39 -1.0e39 -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.0, -0.0, 1.0e39, -1.0e39) @@ -68,9 +68,9 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 -todo(msl) draw quad +draw quad probe (0, 0) rgba (1.0, 0.5, 0.3333333, 0.25) 8 uniform 0 float4 -1.0 -2.0 -3.0 -4.0 -todo(msl) draw quad +draw quad probe (0, 0) rgba (-1.0, -0.5, -0.3333333, -0.25) 8