diff --git a/libs/vkd3d-shader/msl.c b/libs/vkd3d-shader/msl.c index 8e1fc3da..61e943ff 100644 --- a/libs/vkd3d-shader/msl.c +++ b/libs/vkd3d-shader/msl.c @@ -354,22 +354,29 @@ static uint32_t msl_dst_init(struct msl_dst *msl_dst, struct msl_generator *gen, static void VKD3D_PRINTF_FUNC(3, 4) msl_print_assignment( struct msl_generator *gen, struct msl_dst *dst, const char *format, ...) { + uint32_t modifiers = dst->vsir->modifiers; va_list args; if (dst->vsir->shift) msl_compiler_error(gen, VKD3D_SHADER_ERROR_MSL_INTERNAL, "Internal compiler error: Unhandled destination shift %#x.", dst->vsir->shift); - if (dst->vsir->modifiers) + if (modifiers & ~VKD3DSPDM_SATURATE) msl_compiler_error(gen, VKD3D_SHADER_ERROR_MSL_INTERNAL, - "Internal compiler error: Unhandled destination modifier(s) %#x.", dst->vsir->modifiers); + "Internal compiler error: Unhandled destination modifier(s) %#x.", modifiers); msl_print_indent(gen->buffer, gen->indent); vkd3d_string_buffer_printf(gen->buffer, "%s%s = ", dst->register_name->buffer, dst->mask->buffer); + if (modifiers & VKD3DSPDM_SATURATE) + vkd3d_string_buffer_printf(gen->buffer, "saturate("); + va_start(args, format); vkd3d_string_buffer_vprintf(gen->buffer, format, args); va_end(args); + if (modifiers & VKD3DSPDM_SATURATE) + vkd3d_string_buffer_printf(gen->buffer, ")"); + vkd3d_string_buffer_printf(gen->buffer, ";\n"); } diff --git a/tests/hlsl/saturate.shader_test b/tests/hlsl/saturate.shader_test index cc6b3d30..c10a32dd 100644 --- a/tests/hlsl/saturate.shader_test +++ b/tests/hlsl/saturate.shader_test @@ -8,7 +8,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.7 -0.1 0.0 0.0 -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.7, 0.0, 1.0, 0.0) [pixel shader] @@ -22,5 +22,5 @@ float4 main() : sv_target [test] uniform 0 float4 -2 0 2 -1 -todo(msl) draw quad +draw quad probe (0, 0) rgba (0.0, 0.0, 1.0, 0.0)