OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: Simplify the meta init fail path

Browse Source 
Move most of the the cleanup into radv_device_init_meta.

Signed-off-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17652>
This commit is contained in:
Konstantin Seurer
2022-07-20 14:49:38 +02:00
committed by Marge Bot
parent b06e5535c0
commit 1a95d43e55
17 changed files with 90 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/amd/vulkan/radv_device_generated_commands.c
View File

@@ -956,7 +956,7 @@ radv_device_init_dgc_prepare_state(struct radv_device *device)
&device->meta_state.alloc,
&device->meta_state.dgc_prepare.ds_layout);
if (result != VK_SUCCESS)
goto fail;
goto cleanup;
const VkPipelineLayoutCreateInfo leaf_pl_create_info = {
.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO,
@@ -971,7 +971,7 @@ radv_device_init_dgc_prepare_state(struct radv_device *device)
&device->meta_state.alloc,
&device->meta_state.dgc_prepare.p_layout);
if (result != VK_SUCCESS)
goto fail;
goto cleanup;
VkPipelineShaderStageCreateInfo shader_stage = {
.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
@@ -992,12 +992,9 @@ radv_device_init_dgc_prepare_state(struct radv_device *device)
radv_device_to_handle(device), radv_pipeline_cache_to_handle(&device->meta_state.cache), 1,
&pipeline_info, &device->meta_state.alloc, &device->meta_state.dgc_prepare.pipeline);
if (result != VK_SUCCESS)
goto fail;
goto cleanup;
ralloc_free(cs);
return VK_SUCCESS;
fail:
radv_device_finish_dgc_prepare_state(device);
cleanup:
ralloc_free(cs);
return result;
}