radv: fix cleaning the meta query state if an error occured

It's already correctly cleaned in radv_device_init_meta().

This fixes a recent regression with
dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.

Fixes: 1a95d43e55 ("radv: Simplify the meta init fail path")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17952>
(cherry picked from commit 37dfa4e3f3)

Conflicts:
	src/amd/ci/radv-hawaii-aco-fails.txt
	src/amd/ci/radv-oland-aco-fails.txt

Stable:
    - remove CI files that don't exist in 22.2
This commit is contained in:
Samuel Pitoiset 2022-08-09 10:53:02 +02:00 committed by Dylan Baker
parent 9a43a1f1d1
commit 26c1926a4a
5 changed files with 2 additions and 4 deletions

View file

@ -1129,7 +1129,7 @@
"description": "radv: fix cleaning the meta query state if an error occured",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "1a95d43e5508e91d2fc88ad6fce34f202aeab923"
},

View file

@ -257,4 +257,4 @@ dEQP-VK.ssbo.phys.layout.single_basic_type.scalar.i8vec4,Fail
dEQP-VK.ssbo.phys.layout.single_basic_type.scalar.u16vec4,Fail
dEQP-VK.ssbo.phys.layout.single_basic_type.scalar.u8vec4,Fail
dEQP-VK.draw.renderpass.shader_invocation.helper_invocation,Fail
dEQP-VK.draw.renderpass.shader_invocation.helper_invocation,Fail

View file

@ -907,8 +907,6 @@ radv_device_init_meta_query_state_internal(struct radv_device *device)
&pg_pipeline_info, NULL, &device->meta_state.query.pg_query_pipeline);
fail:
if (result != VK_SUCCESS)
radv_device_finish_meta_query_state(device);
ralloc_free(occlusion_cs);
ralloc_free(pipeline_statistics_cs);
ralloc_free(tfb_cs);