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_ADD.

Browse Source
This commit is contained in:
Feifan He 2024-11-22 15:45:54 +08:00 committed by Henri Verbeet
parent b314a9eb84
commit 05b9331d0d
Notes: Henri Verbeet 2024-11-24 00:11:21 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1274
6 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -288,6 +288,23 @@ static void msl_unhandled(struct msl_generator *gen, const struct vkd3d_shader_i
"Internal compiler error: Unhandled instruction %#x.", ins->opcode);
}
static void msl_binop(struct msl_generator *gen, const struct vkd3d_shader_instruction *ins, const char *op)
{
struct msl_src src[2];
struct msl_dst dst;
uint32_t mask;
mask = msl_dst_init(&dst, gen, ins, &ins->dst[0]);
msl_src_init(&src[0], gen, &ins->src[0], mask);
msl_src_init(&src[1], gen, &ins->src[1], mask);
msl_print_assignment(gen, &dst, "%s %s %s", src[0].str->buffer, op, src[1].str->buffer);
msl_src_cleanup(&src[1], &gen->string_buffers);
msl_src_cleanup(&src[0], &gen->string_buffers);
msl_dst_cleanup(&dst, &gen->string_buffers);
}
static void msl_mov(struct msl_generator *gen, const struct vkd3d_shader_instruction *ins)
{
struct msl_src src;
@ -315,6 +332,9 @@ static void msl_handle_instruction(struct msl_generator *gen, const struct vkd3d
switch (ins->opcode)
{
case VKD3DSIH_ADD:
msl_binop(gen, ins, "+");
break;
case VKD3DSIH_DCL_INPUT:
case VKD3DSIH_DCL_OUTPUT:
case VKD3DSIH_DCL_OUTPUT_SIV:

2
tests/hlsl/cbuffer.shader_test
View File

@ -813,7 +813,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 1.0 2.0 3.0 4.0
uniform 4 float4 0.1 0.2 0.3 0.4
todo(msl) draw quad
draw quad
probe (0, 0) rgba (1.1, 2.2, 3.3, 4.4)

2
tests/hlsl/const.shader_test
View File

@ -10,7 +10,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 1.0 2.0 3.0 4.0
uniform 4 float4 0.1 0.2 0.3 0.4
todo(msl) draw quad
draw quad
probe (0, 0) rgba (1.1, 2.2, 3.3, 4.4)
[pixel shader fail(sm<6)]

2
tests/hlsl/expr-indexing.shader_test
View File

@ -9,7 +9,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 1.0 2.0 3.0 4.0
uniform 4 float4 5.0 6.0 7.0 8.0
todo(msl) draw quad
draw quad
probe (0, 0) rgba (8.0, 8.0, 8.0, 8.0)

4
tests/hlsl/loop.shader_test
View File

@ -18,7 +18,7 @@ float4 main() : sv_target
[test]
uniform 0 float 5.0
todo(msl) draw quad
draw quad
probe (0, 0) rgba (50.0, 50.0, 50.0, 50.0)
@ -41,7 +41,7 @@ float4 main() : sv_target
[test]
uniform 0 float 4.0
todo(msl) draw quad
draw quad
probe (0, 0) rgba (20.0, 20.0, 20.0, 20.0)
[pixel shader]

2
tests/hlsl/struct-inheritance.shader_test
View File

@ -28,7 +28,7 @@ uniform 0 float4 1 0 0 0
uniform 4 float4 0 2 0 0
uniform 8 float4 0 0 3 0
uniform 12 float4 0 0 0 4
todo(msl) draw quad
draw quad
probe (0, 0) rgba (1, 0, 3, 4)
% Test writing to a field derived from a base class.