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_IF and VKD3DSIH_ENDIF.

Browse Source
This commit is contained in:
Feifan He 2024-12-03 00:06:32 +08:00 committed by Henri Verbeet
parent 28068c9d4c
commit 610a11ddf8
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
2 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -477,6 +477,31 @@ static void msl_cast(struct msl_generator *gen, const struct vkd3d_shader_instru
msl_dst_cleanup(&dst, &gen->string_buffers); msl_dst_cleanup(&dst, &gen->string_buffers);
} }
static void msl_if(struct msl_generator *gen, const struct vkd3d_shader_instruction *ins)
{
const char *condition;
struct msl_src src;
msl_src_init(&src, gen, &ins->src[0], VKD3DSP_WRITEMASK_0);
msl_print_indent(gen->buffer, gen->indent);
condition = ins->flags == VKD3D_SHADER_CONDITIONAL_OP_NZ ? "bool" : "!bool";
vkd3d_string_buffer_printf(gen->buffer, "if (%s(%s))\n", condition, src.str->buffer);
msl_src_cleanup(&src, &gen->string_buffers);
msl_print_indent(gen->buffer, gen->indent);
vkd3d_string_buffer_printf(gen->buffer, "{\n");
++gen->indent;
}
static void msl_endif(struct msl_generator *gen)
{
--gen->indent;
msl_print_indent(gen->buffer, gen->indent);
vkd3d_string_buffer_printf(gen->buffer, "}\n");
}
static void msl_mov(struct msl_generator *gen, const struct vkd3d_shader_instruction *ins) static void msl_mov(struct msl_generator *gen, const struct vkd3d_shader_instruction *ins)
{ {
struct msl_src src; struct msl_src src;
@ -549,6 +574,9 @@ static void msl_handle_instruction(struct msl_generator *gen, const struct vkd3d
case VKD3DSIH_DP4: case VKD3DSIH_DP4:
msl_dot(gen, ins, VKD3DSP_WRITEMASK_ALL); msl_dot(gen, ins, VKD3DSP_WRITEMASK_ALL);
break; break;
case VKD3DSIH_ENDIF:
msl_endif(gen);
break;
case VKD3DSIH_IEQ: case VKD3DSIH_IEQ:
msl_relop(gen, ins, "=="); msl_relop(gen, ins, "==");
break; break;
@ -567,6 +595,9 @@ static void msl_handle_instruction(struct msl_generator *gen, const struct vkd3d
case VKD3DSIH_GEO: case VKD3DSIH_GEO:
msl_relop(gen, ins, ">="); msl_relop(gen, ins, ">=");
break; break;
case VKD3DSIH_IF:
msl_if(gen, ins);
break;
case VKD3DSIH_LTO: case VKD3DSIH_LTO:
msl_relop(gen, ins, "<"); msl_relop(gen, ins, "<");
break; break;

12
tests/hlsl/hard-copy-prop.shader_test
View File

@ -17,10 +17,10 @@ float4 main() : sv_target
[test] [test]
uniform 0 float 0.0 uniform 0 float 0.0
todo(sm<4 | msl) draw quad todo(sm<4) draw quad
probe (0, 0) rgba (2.0, 2.0, 2.0, 2.0) probe (0, 0) rgba (2.0, 2.0, 2.0, 2.0)
uniform 0 float 1.0 uniform 0 float 1.0
todo(sm<4 | msl) draw quad todo(sm<4) draw quad
probe (0, 0) rgba (-2.0, -2.0, -2.0, -2.0) probe (0, 0) rgba (-2.0, -2.0, -2.0, -2.0)
@ -43,10 +43,10 @@ float4 main() : sv_target
[test] [test]
uniform 0 float 0.0 uniform 0 float 0.0
todo(sm<4 | msl) draw quad todo(sm<4) draw quad
probe (0, 0) rgba (2.0, 2.0, 2.0, 2.0) probe (0, 0) rgba (2.0, 2.0, 2.0, 2.0)
uniform 0 float 1.0 uniform 0 float 1.0
todo(sm<4 | msl) draw quad todo(sm<4) draw quad
probe (0, 0) rgba (20.0, 20.0, 20.0, 20.0) probe (0, 0) rgba (20.0, 20.0, 20.0, 20.0)
@ -69,8 +69,8 @@ float4 main() : sv_target
[test] [test]
uniform 0 float 0.0 uniform 0 float 0.0
todo(sm<4 | msl) draw quad todo(sm<4) draw quad
probe (0, 0) rgba (1.0, 4.0, 0.0, 0.0) probe (0, 0) rgba (1.0, 4.0, 0.0, 0.0)
uniform 0 float 1.0 uniform 0 float 1.0
todo(sm<4 | msl) draw quad todo(sm<4) draw quad
probe (0, 0) rgba (1.0, 40.0, 0.0, 0.0) probe (0, 0) rgba (1.0, 40.0, 0.0, 0.0)