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: Centralize cleanup on error in scan_with_parser().

Browse Source
This commit is contained in:
Zebediah Figura 2023-07-31 18:36:30 -05:00 committed by Alexandre Julliard
parent 9c5cb2de18
commit fd4a820c4b
Notes: Alexandre Julliard 2023-08-14 21:00:15 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/295
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1132,11 +1132,7 @@ static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info
{ {
instruction = &parser->instructions.elements[i]; instruction = &parser->instructions.elements[i];
if ((ret = vkd3d_shader_scan_instruction(&context, instruction)) < 0) if ((ret = vkd3d_shader_scan_instruction(&context, instruction)) < 0)
{
if (scan_descriptor_info)
vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info);
break; break;
}
} }
for (i = 0; i < ARRAY_SIZE(parser->shader_desc.flat_constant_count); ++i) for (i = 0; i < ARRAY_SIZE(parser->shader_desc.flat_constant_count); ++i)
@ -1156,13 +1152,17 @@ static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info
|| !vkd3d_shader_signature_from_shader_signature(&signature_info->patch_constant, || !vkd3d_shader_signature_from_shader_signature(&signature_info->patch_constant,
&parser->shader_desc.patch_constant_signature)) &parser->shader_desc.patch_constant_signature))
{ {
vkd3d_shader_free_scan_signature_info(signature_info);
if (scan_descriptor_info)
vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info);
ret = VKD3D_ERROR_OUT_OF_MEMORY; ret = VKD3D_ERROR_OUT_OF_MEMORY;
} }
} }
if (ret < 0)
{
if (scan_descriptor_info)
vkd3d_shader_free_scan_descriptor_info(scan_descriptor_info);
if (signature_info)
vkd3d_shader_free_scan_signature_info(signature_info);
}
vkd3d_shader_scan_context_cleanup(&context); vkd3d_shader_scan_context_cleanup(&context);
return ret; return ret;
} }