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 compute shaders.

Browse Source
This commit is contained in:
Henri Verbeet
2025-05-31 20:05:18 +02:00
parent 305c2c0db4
commit a1edfc4008
Notes: Henri Verbeet 2025-08-28 20:32:25 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1695
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1996,6 +1996,7 @@ static void msl_generate_entrypoint_epilogue(struct msl_generator *gen)
static void msl_generate_entrypoint(struct msl_generator *gen) static void msl_generate_entrypoint(struct msl_generator *gen)
{ {
enum vkd3d_shader_type type = gen->program->shader_version.type; enum vkd3d_shader_type type = gen->program->shader_version.type;
bool output = true;
switch (type) switch (type)
{ {
@@ -2007,13 +2008,21 @@ static void msl_generate_entrypoint(struct msl_generator *gen)
vkd3d_string_buffer_printf(gen->buffer, "[[early_fragment_tests]]\n"); vkd3d_string_buffer_printf(gen->buffer, "[[early_fragment_tests]]\n");
vkd3d_string_buffer_printf(gen->buffer, "fragment "); vkd3d_string_buffer_printf(gen->buffer, "fragment ");
break; break;
case VKD3D_SHADER_TYPE_COMPUTE:
vkd3d_string_buffer_printf(gen->buffer, "kernel ");
output = false;
break;
default: default:
msl_compiler_error(gen, VKD3D_SHADER_ERROR_MSL_INTERNAL, msl_compiler_error(gen, VKD3D_SHADER_ERROR_MSL_INTERNAL,
"Internal compiler error: Unhandled shader type %#x.", type); "Internal compiler error: Unhandled shader type %#x.", type);
return; return;
} }
vkd3d_string_buffer_printf(gen->buffer, "vkd3d_%s_out shader_entry(\n", gen->prefix); if (output)
vkd3d_string_buffer_printf(gen->buffer, "vkd3d_%s_out ", gen->prefix);
else
vkd3d_string_buffer_printf(gen->buffer, "void ");
vkd3d_string_buffer_printf(gen->buffer, "shader_entry(\n");
if (gen->program->descriptors.descriptor_count) if (gen->program->descriptors.descriptor_count)
{ {
@@ -2055,7 +2064,9 @@ static void msl_generate_entrypoint(struct msl_generator *gen)
msl_generate_entrypoint_epilogue(gen); msl_generate_entrypoint_epilogue(gen);
vkd3d_string_buffer_printf(gen->buffer, " return output;\n}\n"); if (output)
vkd3d_string_buffer_printf(gen->buffer, " return output;\n");
vkd3d_string_buffer_printf(gen->buffer, "}\n");
} }
static int msl_generator_generate(struct msl_generator *gen, struct vkd3d_shader_code *out) static int msl_generator_generate(struct msl_generator *gen, struct vkd3d_shader_code *out)

2
tests/hlsl/uav-out-param.shader_test
View File

@@ -26,7 +26,7 @@ void main()
} }
[test] [test]
todo(msl) dispatch 1 1 1 dispatch 1 1 1
probe uav 0 (0, 0) f32(0.4, 0.1, 0.2, 0.3) probe uav 0 (0, 0) f32(0.4, 0.1, 0.2, 0.3)
[uav 0] [uav 0]