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: Factor out a vsir_parse() helper.

Browse Source
This commit is contained in:
Elizabeth Figura 2024-10-04 18:05:23 -05:00 committed by Henri Verbeet
parent 4889c71857
commit 3a3f95e1e7
Notes: Henri Verbeet 2024-10-23 16:18:19 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1215
1 changed files with 33 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
libs/vkd3d-shader/vkd3d_shader_main.c
View File

@ -680,6 +680,37 @@ static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_
return VKD3D_OK; return VKD3D_OK;
} }
static enum vkd3d_result vsir_parse(const struct vkd3d_shader_compile_info *compile_info, uint64_t config_flags,
struct vkd3d_shader_message_context *message_context, struct vsir_program *program)
{
enum vkd3d_result ret;
switch (compile_info->source_type)
{
case VKD3D_SHADER_SOURCE_D3D_BYTECODE:
ret = d3dbc_parse(compile_info, config_flags, message_context, program);
break;
case VKD3D_SHADER_SOURCE_DXBC_TPF:
ret = tpf_parse(compile_info, config_flags, message_context, program);
break;
case VKD3D_SHADER_SOURCE_DXBC_DXIL:
ret = dxil_parse(compile_info, config_flags, message_context, program);
break;
default:
ERR("Unsupported source type %#x.\n", compile_info->source_type);
ret = VKD3D_ERROR_INVALID_ARGUMENT;
break;
}
if (ret < 0)
WARN("Failed to parse shader.\n");
return ret;
}
void vkd3d_shader_free_messages(char *messages) void vkd3d_shader_free_messages(char *messages)
{ {
TRACE("messages %p.\n", messages); TRACE("messages %p.\n", messages);
@ -1578,31 +1609,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char
uint64_t config_flags = vkd3d_shader_init_config_flags(); uint64_t config_flags = vkd3d_shader_init_config_flags();
struct vsir_program program; struct vsir_program program;
switch (compile_info->source_type) if (!(ret = vsir_parse(compile_info, config_flags, &message_context, &program)))
{
case VKD3D_SHADER_SOURCE_D3D_BYTECODE:
ret = d3dbc_parse(compile_info, config_flags, &message_context, &program);
break;
case VKD3D_SHADER_SOURCE_DXBC_TPF:
ret = tpf_parse(compile_info, config_flags, &message_context, &program);
break;
case VKD3D_SHADER_SOURCE_DXBC_DXIL:
ret = dxil_parse(compile_info, config_flags, &message_context, &program);
break;
default:
ERR("Unsupported source type %#x.\n", compile_info->source_type);
ret = VKD3D_ERROR_INVALID_ARGUMENT;
break;
}
if (ret < 0)
{
WARN("Failed to parse shader.\n");
}
else
{ {
ret = vsir_program_scan(&program, compile_info, &message_context, NULL); ret = vsir_program_scan(&program, compile_info, &message_context, NULL);
vsir_program_cleanup(&program); vsir_program_cleanup(&program);
@ -1719,31 +1726,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info,
uint64_t config_flags = vkd3d_shader_init_config_flags(); uint64_t config_flags = vkd3d_shader_init_config_flags();
struct vsir_program program; struct vsir_program program;
switch (compile_info->source_type) if (!(ret = vsir_parse(compile_info, config_flags, &message_context, &program)))
{
case VKD3D_SHADER_SOURCE_D3D_BYTECODE:
ret = d3dbc_parse(compile_info, config_flags, &message_context, &program);
break;
case VKD3D_SHADER_SOURCE_DXBC_TPF:
ret = tpf_parse(compile_info, config_flags, &message_context, &program);
break;
case VKD3D_SHADER_SOURCE_DXBC_DXIL:
ret = dxil_parse(compile_info, config_flags, &message_context, &program);
break;
default:
ERR("Unsupported source type %#x.\n", compile_info->source_type);
ret = VKD3D_ERROR_INVALID_ARGUMENT;
break;
}
if (ret < 0)
{
WARN("Failed to parse shader.\n");
}
else
{ {
ret = vsir_program_compile(&program, config_flags, compile_info, out, &message_context); ret = vsir_program_compile(&program, config_flags, compile_info, out, &message_context);
vsir_program_cleanup(&program); vsir_program_cleanup(&program);