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

Browse Source
This commit is contained in:
Henri Verbeet
2025-05-23 16:53:38 +02:00
parent f538085e41
commit 7dfa9e8f81
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
3 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -737,19 +737,36 @@ static void msl_begin_block(struct msl_generator *gen)
++gen->indent;
}
static void msl_if(struct msl_generator *gen, const struct vkd3d_shader_instruction *ins)
static void msl_print_condition(struct vkd3d_string_buffer *buffer, struct msl_generator *gen,
enum vkd3d_shader_conditional_op op, const struct vkd3d_shader_src_param *arg)
{
const char *condition;
struct msl_src src;
msl_src_init(&src, gen, &ins->src[0], VKD3DSP_WRITEMASK_0);
msl_src_init(&src, gen, arg, 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);
condition = op == VKD3D_SHADER_CONDITIONAL_OP_NZ ? "bool" : "!bool";
vkd3d_string_buffer_printf(buffer, "if (%s(%s))\n", condition, src.str->buffer);
msl_src_cleanup(&src, &gen->string_buffers);
}
static void msl_discard(struct msl_generator *gen, const struct vkd3d_shader_instruction *ins)
{
/* Note that discard_fragment() in Metal 2.2 and earlier behaves like
* SPIR-V OpKill, while in Metal 2.3 and later it behaves like
* OpDemoteToHelperInvocationEXT. We assume we have at least Metal 3
* here. */
msl_print_indent(gen->buffer, gen->indent);
msl_print_condition(gen->buffer, gen, ins->flags, &ins->src[0]);
msl_print_indent(gen->buffer, gen->indent + 1);
vkd3d_string_buffer_printf(gen->buffer, "discard_fragment();\n");
}
static void msl_if(struct msl_generator *gen, const struct vkd3d_shader_instruction *ins)
{
msl_print_indent(gen->buffer, gen->indent);
msl_print_condition(gen->buffer, gen, ins->flags, &ins->src[0]);
msl_begin_block(gen);
}
@@ -1024,6 +1041,9 @@ static void msl_handle_instruction(struct msl_generator *gen, const struct vkd3d
case VKD3DSIH_DEFAULT:
msl_default(gen);
break;
case VKD3DSIH_DISCARD:
msl_discard(gen, ins);
break;
case VKD3DSIH_DIV:
msl_binop(gen, ins, "/");
break;

12
tests/hlsl/clip.shader_test
View File

@@ -9,20 +9,20 @@ float4 main() : sv_target
[test]
uniform 0 float4 1 2 3 4
todo(glsl | msl) draw quad
todo(glsl) draw quad
probe (0, 0) rgba (1, 2, 3, 4)
uniform 0 float4 9 8 7 6
todo(glsl | msl) draw quad
todo(glsl) draw quad
probe (0, 0) rgba (9, 8, 7, 6)
uniform 0 float4 -1 8 7 6
todo(glsl | msl) draw quad
todo(glsl) draw quad
probe (0, 0) rgba (9, 8, 7, 6)
uniform 0 float4 9 0 7 6
todo(glsl | msl) draw quad
todo(glsl) draw quad
probe (0, 0) rgba (9, 0, 7, 6)
uniform 0 float4 3 -8 3 0
todo(glsl | msl) draw quad
todo(glsl) draw quad
probe (0, 0) rgba (9, 0, 7, 6)
uniform 0 float4 3 3 3 -1
todo(glsl | msl) draw quad
todo(glsl) draw quad
probe (0, 0) rgba (9, 0, 7, 6)

4
tests/hlsl/discard.shader_test
View File

@@ -10,10 +10,10 @@ float4 main() : sv_target
[test]
uniform 0 float4 1 2 3 4
todo(sm<4 | glsl | msl) draw quad
todo(sm<4 | glsl) draw quad
probe (0, 0) rgba (1, 2, 3, 4)
uniform 0 float4 9 8 7 6
todo(sm<4 | glsl | msl) draw quad
todo(sm<4 | glsl) draw quad
probe (0, 0) rgba (1, 2, 3, 4)
[require]