From 26c1926a4a080fc055a10516782ae884990111cd Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 9 Aug 2022 10:53:02 +0200 Subject: [PATCH] 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: 1a95d43e550 ("radv: Simplify the meta init fail path") Signed-off-by: Samuel Pitoiset Reviewed-by: Konstantin Seurer Part-of: (cherry picked from commit 37dfa4e3f3c669af16a53aa6c0401989a26099a1) 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 --- .pick_status.json | 2 +- src/amd/ci/radv-hawaii-aco-fails.txt | 0 src/amd/ci/radv-navi21-llvm-fails.txt | 2 +- src/amd/ci/radv-oland-aco-fails.txt | 0 src/amd/vulkan/radv_query.c | 2 -- 5 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 src/amd/ci/radv-hawaii-aco-fails.txt delete mode 100644 src/amd/ci/radv-oland-aco-fails.txt diff --git a/.pick_status.json b/.pick_status.json index 11fd55b0fb9..43417494b15 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -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" }, diff --git a/src/amd/ci/radv-hawaii-aco-fails.txt b/src/amd/ci/radv-hawaii-aco-fails.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/amd/ci/radv-navi21-llvm-fails.txt b/src/amd/ci/radv-navi21-llvm-fails.txt index a65f85e56e9..a2db4b35fb4 100644 --- a/src/amd/ci/radv-navi21-llvm-fails.txt +++ b/src/amd/ci/radv-navi21-llvm-fails.txt @@ -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 \ No newline at end of file +dEQP-VK.draw.renderpass.shader_invocation.helper_invocation,Fail diff --git a/src/amd/ci/radv-oland-aco-fails.txt b/src/amd/ci/radv-oland-aco-fails.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c index 6fea696b1f6..eebab104a82 100644 --- a/src/amd/vulkan/radv_query.c +++ b/src/amd/vulkan/radv_query.c @@ -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);