wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/glsl: Implement support for compute shaders.

Browse Source
This commit is contained in:
Henri Verbeet 2024-10-06 00:10:19 +02:00
parent fb17ba18ae
commit bf71b13797
Notes: Henri Verbeet 2024-10-10 20:10:19 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1171
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/vkd3d-shader/glsl.c
View File

@ -2068,6 +2068,14 @@ static void shader_glsl_generate_declarations(struct vkd3d_glsl_generator *gen)
{ {
const struct vsir_program *program = gen->program; const struct vsir_program *program = gen->program;
struct vkd3d_string_buffer *buffer = gen->buffer; struct vkd3d_string_buffer *buffer = gen->buffer;
const struct vsir_thread_group_size *group_size;
if (program->shader_version.type == VKD3D_SHADER_TYPE_COMPUTE)
{
group_size = &program->thread_group_size;
vkd3d_string_buffer_printf(buffer, "layout(local_size_x = %u, local_size_y = %u, local_size_z = %u) in;\n\n",
group_size->x, group_size->y, group_size->z);
}
shader_glsl_generate_descriptor_declarations(gen); shader_glsl_generate_descriptor_declarations(gen);
shader_glsl_generate_input_declarations(gen); shader_glsl_generate_input_declarations(gen);
@ -2149,6 +2157,10 @@ static void shader_glsl_init_limits(struct vkd3d_glsl_generator *gen, const stru
limits->input_count = 32; limits->input_count = 32;
limits->output_count = 8; limits->output_count = 8;
break; break;
case VKD3D_SHADER_TYPE_COMPUTE:
limits->input_count = 0;
limits->output_count = 0;
break;
default: default:
vkd3d_glsl_compiler_error(gen, VKD3D_SHADER_ERROR_GLSL_INTERNAL, vkd3d_glsl_compiler_error(gen, VKD3D_SHADER_ERROR_GLSL_INTERNAL,
"Internal compiler error: Unhandled shader type %#x.", version->type); "Internal compiler error: Unhandled shader type %#x.", version->type);
@ -2179,8 +2191,8 @@ static void vkd3d_glsl_generator_init(struct vkd3d_glsl_generator *gen,
gen->prefix = "unknown"; gen->prefix = "unknown";
} }
shader_glsl_init_limits(gen, &program->shader_version); shader_glsl_init_limits(gen, &program->shader_version);
gen->interstage_input = type != VKD3D_SHADER_TYPE_VERTEX; gen->interstage_input = type != VKD3D_SHADER_TYPE_VERTEX && type != VKD3D_SHADER_TYPE_COMPUTE;
gen->interstage_output = type != VKD3D_SHADER_TYPE_PIXEL; gen->interstage_output = type != VKD3D_SHADER_TYPE_PIXEL && type != VKD3D_SHADER_TYPE_COMPUTE;
gen->interface_info = vkd3d_find_struct(compile_info->next, INTERFACE_INFO); gen->interface_info = vkd3d_find_struct(compile_info->next, INTERFACE_INFO);
gen->offset_info = vkd3d_find_struct(compile_info->next, DESCRIPTOR_OFFSET_INFO); gen->offset_info = vkd3d_find_struct(compile_info->next, DESCRIPTOR_OFFSET_INFO);

2
tests/hlsl/compute.shader_test
View File

@ -18,5 +18,5 @@ void main()
} }
[test] [test]
todo(glsl) dispatch 1 1 1 dispatch 1 1 1
probe uav 0 (0, 0) r (-123.0) probe uav 0 (0, 0) r (-123.0)

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

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