wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/msl: Implement VKD3DSIH_MAX.

Browse Source
This commit is contained in:
Feifan He 2024-12-03 00:46:35 +08:00 committed by Henri Verbeet
parent 64ea033c81
commit ab2cb43e15
Notes: Henri Verbeet 2024-12-04 14:44:01 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1294
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -422,16 +422,25 @@ static void msl_dot(struct msl_generator *gen, const struct vkd3d_shader_instruc
static void msl_intrinsic(struct msl_generator *gen, const struct vkd3d_shader_instruction *ins, const char *op) static void msl_intrinsic(struct msl_generator *gen, const struct vkd3d_shader_instruction *ins, const char *op)
{ {
struct vkd3d_string_buffer *args;
struct msl_src src; struct msl_src src;
struct msl_dst dst; struct msl_dst dst;
unsigned int i;
uint32_t mask; uint32_t mask;
mask = msl_dst_init(&dst, gen, ins, &ins->dst[0]); mask = msl_dst_init(&dst, gen, ins, &ins->dst[0]);
msl_src_init(&src, gen, &ins->src[0], mask); args = vkd3d_string_buffer_get(&gen->string_buffers);
msl_print_assignment(gen, &dst, "%s(%s)", op, src.str->buffer); for (i = 0; i < ins->src_count; ++i)
{
msl_src_init(&src, gen, &ins->src[i], mask);
vkd3d_string_buffer_printf(args, "%s%s", i ? ", " : "", src.str->buffer);
msl_src_cleanup(&src, &gen->string_buffers);
}
msl_src_cleanup(&src, &gen->string_buffers); msl_print_assignment(gen, &dst, "%s(%s)", op, args->buffer);
vkd3d_string_buffer_release(&gen->string_buffers, args);
msl_dst_cleanup(&dst, &gen->string_buffers); msl_dst_cleanup(&dst, &gen->string_buffers);
} }
@ -601,6 +610,9 @@ static void msl_handle_instruction(struct msl_generator *gen, const struct vkd3d
case VKD3DSIH_LTO: case VKD3DSIH_LTO:
msl_relop(gen, ins, "<"); msl_relop(gen, ins, "<");
break; break;
case VKD3DSIH_MAX:
msl_intrinsic(gen, ins, "max");
break;
case VKD3DSIH_INE: case VKD3DSIH_INE:
case VKD3DSIH_NEU: case VKD3DSIH_NEU:
msl_relop(gen, ins, "!="); msl_relop(gen, ins, "!=");

8
tests/hlsl/lit.shader_test
View File

@ -8,17 +8,17 @@ float4 main() : sv_target
[test] [test]
uniform 0 float4 -0.1 10.0 0.0 0.0 uniform 0 float4 -0.1 10.0 0.0 0.0
todo(msl) draw quad draw quad
probe (0, 0) rgba (1.0, 0.0, 0.0, 1.0) probe (0, 0) rgba (1.0, 0.0, 0.0, 1.0)
[test] [test]
uniform 0 float4 1.2 -0.1 0.0 0.0 uniform 0 float4 1.2 -0.1 0.0 0.0
todo(msl) draw quad draw quad
probe (0, 0) rgba (1.0, 1.2, 0.0, 1.0) probe (0, 0) rgba (1.0, 1.2, 0.0, 1.0)
[test] [test]
uniform 0 float4 1.2 2.0 3.0 0.0 uniform 0 float4 1.2 2.0 3.0 0.0
todo(msl) draw quad draw quad
probe (0, 0) rgba (1.0, 1.2, 8.0, 1.0) probe (0, 0) rgba (1.0, 1.2, 8.0, 1.0)
[pixel shader] [pixel shader]
@ -31,7 +31,7 @@ float4 main() : sv_target
[test] [test]
uniform 0 float4 1.2 2.0 3.0 0.0 uniform 0 float4 1.2 2.0 3.0 0.0
todo(msl) draw quad draw quad
probe (0, 0) rgba (2.0, 2.4, 16.0, 2.0) probe (0, 0) rgba (2.0, 2.4, 16.0, 2.0)
[pixel shader fail] [pixel shader fail]

4
tests/hlsl/max-min.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, 2.1, 2.0, -1.0) probe (0, 0) rgba (0.7, 2.1, 2.0, -1.0)
@ -24,7 +24,7 @@ float4 main() : sv_target
[test] [test]
uniform 0 float4 0.7 -0.1 0.4 0.8 uniform 0 float4 0.7 -0.1 0.4 0.8
todo(msl) draw quad draw quad
probe (0, 0) rgba (0.7, 0.8, 0.7, 0.2) probe (0, 0) rgba (0.7, 0.8, 0.7, 0.2)