Module: Mesa Branch: main Commit: a49a2f87658f9e4553069b07250ab65bc73f7378 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a49a2f87658f9e4553069b07250ab65bc73f7378
Author: Matt Coster <[email protected]> Date: Thu May 18 11:09:41 2023 +0100 pvr: Correct error flow in pvr_graphics_pipeline_compile() Fixes: dEQP-VK.api.object_management.alloc_callback_fail.graphics_pipeline Signed-off-by: Matt Coster <[email protected]> Reviewed-by: Karmjit Mahil <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23130> --- src/imagination/vulkan/pvr_pipeline.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/imagination/vulkan/pvr_pipeline.c b/src/imagination/vulkan/pvr_pipeline.c index 05bf2b5df5c..2ae9ab34724 100644 --- a/src/imagination/vulkan/pvr_pipeline.c +++ b/src/imagination/vulkan/pvr_pipeline.c @@ -2166,7 +2166,7 @@ pvr_graphics_pipeline_compile(struct pvr_device *const device, &special_vars_layout, &gfx_pipeline->shader_state.vertex.pds_attrib_programs); if (result != VK_SUCCESS) - goto err_free_vertex_descriptor_program; + goto err_free_frag_descriptor_program; result = pvr_pds_descriptor_program_create_and_upload( device, @@ -2203,11 +2203,11 @@ err_free_vertex_attrib_program: pvr_pds_vertex_attrib_program_destroy(device, allocator, attrib_program); } -err_free_vertex_descriptor_program: +err_free_frag_descriptor_program: pvr_pds_descriptor_program_destroy( device, allocator, - &gfx_pipeline->shader_state.vertex.descriptor_state); + &gfx_pipeline->shader_state.fragment.descriptor_state); err_free_frag_program: pvr_bo_suballoc_free( gfx_pipeline->shader_state.fragment.pds_fragment_program.pvr_bo);
