wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/msl: Implement loops.

Browse Source
This commit is contained in:
Henri Verbeet
2025-05-23 15:45:11 +02:00
parent a570932b82
commit 79be1d3051
Notes: Henri Verbeet 2025-06-10 18:06:32 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1554
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -761,6 +761,19 @@ static void msl_else(struct msl_generator *gen)
msl_begin_block(gen); msl_begin_block(gen);
} }
static void msl_loop(struct msl_generator *gen)
{
msl_print_indent(gen->buffer, gen->indent);
vkd3d_string_buffer_printf(gen->buffer, "for (;;)\n");
msl_begin_block(gen);
}
static void msl_break(struct msl_generator *gen)
{
msl_print_indent(gen->buffer, gen->indent);
vkd3d_string_buffer_printf(gen->buffer, "break;\n");
}
static void msl_ld(struct msl_generator *gen, const struct vkd3d_shader_instruction *ins) static void msl_ld(struct msl_generator *gen, const struct vkd3d_shader_instruction *ins)
{ {
const struct msl_resource_type_info *resource_type_info; const struct msl_resource_type_info *resource_type_info;
@@ -966,6 +979,9 @@ static void msl_handle_instruction(struct msl_generator *gen, const struct vkd3d
case VKD3DSIH_AND: case VKD3DSIH_AND:
msl_binop(gen, ins, "&"); msl_binop(gen, ins, "&");
break; break;
case VKD3DSIH_BREAK:
msl_break(gen);
break;
case VKD3DSIH_DCL_INDEXABLE_TEMP: case VKD3DSIH_DCL_INDEXABLE_TEMP:
msl_dcl_indexable_temp(gen, ins); msl_dcl_indexable_temp(gen, ins);
break; break;
@@ -987,6 +1003,7 @@ static void msl_handle_instruction(struct msl_generator *gen, const struct vkd3d
msl_else(gen); msl_else(gen);
break; break;
case VKD3DSIH_ENDIF: case VKD3DSIH_ENDIF:
case VKD3DSIH_ENDLOOP:
msl_end_block(gen); msl_end_block(gen);
break; break;
case VKD3DSIH_EQO: case VKD3DSIH_EQO:
@@ -1049,6 +1066,9 @@ static void msl_handle_instruction(struct msl_generator *gen, const struct vkd3d
case VKD3DSIH_LOG: case VKD3DSIH_LOG:
msl_intrinsic(gen, ins, "log2"); msl_intrinsic(gen, ins, "log2");
break; break;
case VKD3DSIH_LOOP:
msl_loop(gen);
break;
case VKD3DSIH_MOV: case VKD3DSIH_MOV:
msl_mov(gen, ins); msl_mov(gen, ins);
break; break;

6
tests/hlsl/loop.shader_test
View File

@@ -118,7 +118,7 @@ float4 main() : sv_target
} }
[test] [test]
todo(sm<4 | msl) draw quad todo(sm<4) draw quad
probe (0, 0) rgba (10.0, 10.0, 10.0, 10.0) probe (0, 0) rgba (10.0, 10.0, 10.0, 10.0)
[pixel shader todo(sm<4)] [pixel shader todo(sm<4)]
@@ -137,7 +137,7 @@ float4 main() : sv_target
} }
[test] [test]
todo(sm<4 | msl) draw quad todo(sm<4) draw quad
probe (0, 0) rgba (10.0, 10.0, 10.0, 10.0) probe (0, 0) rgba (10.0, 10.0, 10.0, 10.0)
[pixel shader todo(sm<4)] [pixel shader todo(sm<4)]
@@ -156,7 +156,7 @@ float4 main() : sv_target
} }
[test] [test]
todo(sm<4 | msl) draw quad todo(sm<4) draw quad
probe (0, 0) rgba (10.0, 10.0, 10.0, 10.0) probe (0, 0) rgba (10.0, 10.0, 10.0, 10.0)
% unroll can't be used with fastopt or loop % unroll can't be used with fastopt or loop