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

15
src/amd/vulkan/radv_meta_blit.c
View File

@@ -932,7 +932,7 @@ radv_device_init_meta_blit_state(struct radv_device *device, bool on_demand)
radv_CreateDescriptorSetLayout(radv_device_to_handle(device), &ds_layout_info,
&device->meta_state.alloc, &device->meta_state.blit.ds_layout);
if (result != VK_SUCCESS)
goto fail;
return result;
const VkPushConstantRange push_constant_range = {VK_SHADER_STAGE_VERTEX_BIT, 0, 20};
@@ -947,20 +947,15 @@ radv_device_init_meta_blit_state(struct radv_device *device, bool on_demand)
&device->meta_state.alloc,
&device->meta_state.blit.pipeline_layout);
if (result != VK_SUCCESS)
goto fail;
return result;
result = radv_device_init_meta_blit_color(device, on_demand);
if (result != VK_SUCCESS)
goto fail;
return result;
result = radv_device_init_meta_blit_depth(device, on_demand);
if (result != VK_SUCCESS)
goto fail;
return result;
result = radv_device_init_meta_blit_stencil(device, on_demand);
fail:
if (result != VK_SUCCESS)
radv_device_finish_meta_blit_state(device);
return result;
return radv_device_init_meta_blit_stencil(device, on_demand);
}