wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/msl: Implement support for VKD3DSPDM_SATURATE modifiers.

Browse Source
This commit is contained in:
Feifan He
2024-12-03 01:01:59 +08:00
committed by Henri Verbeet
parent ebf5828542
commit 8e0de82c74
Notes: Henri Verbeet 2024-12-05 21:36:59 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1302
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/vkd3d-shader/msl.c
View File

@ -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( static void VKD3D_PRINTF_FUNC(3, 4) msl_print_assignment(
struct msl_generator *gen, struct msl_dst *dst, const char *format, ...) struct msl_generator *gen, struct msl_dst *dst, const char *format, ...)
{ {
uint32_t modifiers = dst->vsir->modifiers;
va_list args; va_list args;
if (dst->vsir->shift) if (dst->vsir->shift)
msl_compiler_error(gen, VKD3D_SHADER_ERROR_MSL_INTERNAL, msl_compiler_error(gen, VKD3D_SHADER_ERROR_MSL_INTERNAL,
"Internal compiler error: Unhandled destination shift %#x.", dst->vsir->shift); "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, 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); msl_print_indent(gen->buffer, gen->indent);
vkd3d_string_buffer_printf(gen->buffer, "%s%s = ", dst->register_name->buffer, dst->mask->buffer); 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); va_start(args, format);
vkd3d_string_buffer_vprintf(gen->buffer, format, args); vkd3d_string_buffer_vprintf(gen->buffer, format, args);
va_end(args); va_end(args);
if (modifiers & VKD3DSPDM_SATURATE)
vkd3d_string_buffer_printf(gen->buffer, ")");
vkd3d_string_buffer_printf(gen->buffer, ";\n"); vkd3d_string_buffer_printf(gen->buffer, ";\n");
} }

4
tests/hlsl/saturate.shader_test
View File

@ -8,7 +8,7 @@ float4 main() : sv_target
[test] [test]
uniform 0 float4 0.7 -0.1 0.0 0.0 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) probe (0, 0) rgba (0.7, 0.0, 1.0, 0.0)
[pixel shader] [pixel shader]
@ -22,5 +22,5 @@ float4 main() : sv_target
[test] [test]
uniform 0 float4 -2 0 2 -1 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) probe (0, 0) rgba (0.0, 0.0, 1.0, 0.0)