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/ir: Refactor return code checking in vkd3d_shader_normalise().

Browse Source 
We started with only one or two of these but it has become excessive.

Patch originally written by Conor McCarthy and updated by Giovanni Mascellani.
This commit is contained in:
Conor McCarthy 2024-01-16 17:35:04 +10:00 committed by Alexandre Julliard
parent b3903636f7
commit 6df725718a
Notes: Alexandre Julliard 2024-01-23 23:04:04 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Francisco Casas (@fcasas)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/574
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
libs/vkd3d-shader/ir.c
View File

@ -2260,38 +2260,43 @@ enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser,
if (parser->shader_desc.is_dxil)
return result;
if (parser->program.shader_version.type != VKD3D_SHADER_TYPE_PIXEL
&& (result = remap_output_signature(parser, compile_info)) < 0)
if (parser->program.shader_version.type != VKD3D_SHADER_TYPE_PIXEL)
{
if ((result = remap_output_signature(parser, compile_info)) < 0)
return result;
}
if (parser->program.shader_version.type == VKD3D_SHADER_TYPE_HULL)
{
if ((result = instruction_array_flatten_hull_shader_phases(instructions)) < 0)
return result;
if ((result = instruction_array_normalise_hull_shader_control_point_io(instructions,
&parser->shader_desc.input_signature)) < 0)
return result;
}
if ((result = shader_normalise_io_registers(parser)) < 0)
return result;
if (parser->program.shader_version.type == VKD3D_SHADER_TYPE_HULL
&& (result = instruction_array_flatten_hull_shader_phases(instructions)) >= 0)
{
result = instruction_array_normalise_hull_shader_control_point_io(instructions,
&parser->shader_desc.input_signature);
}
if (result >= 0)
result = shader_normalise_io_registers(parser);
if ((result = instruction_array_normalise_flat_constants(&parser->program)) < 0)
return result;
if (result >= 0)
result = instruction_array_normalise_flat_constants(&parser->program);
remove_dead_code(&parser->program);
if (result >= 0)
remove_dead_code(&parser->program);
if ((result = flatten_control_flow_constructs(parser)) < 0)
return result;
if (result >= 0)
result = flatten_control_flow_constructs(parser);
if ((result = normalise_combined_samplers(parser)) < 0)
return result;
if (result >= 0)
result = normalise_combined_samplers(parser);
if (result >= 0 && TRACE_ON())
if (TRACE_ON())
vkd3d_shader_trace(&parser->program);
if (result >= 0 && !parser->failed)
result = vsir_validate(parser);
if (!parser->failed && (result = vsir_validate(parser)) < 0)
return result;
if (result >= 0 && parser->failed)
if (parser->failed)
result = VKD3D_ERROR_INVALID_SHADER;
return result;