From 37dfa4e3f3c669af16a53aa6c0401989a26099a1 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: --- src/amd/ci/radv-bonaire-aco-fails.txt | 2 -- src/amd/ci/radv-fiji-aco-fails.txt | 2 -- src/amd/ci/radv-hawaii-aco-fails.txt | 1 - src/amd/ci/radv-navi10-aco-fails.txt | 2 -- src/amd/ci/radv-navi14-aco-fails.txt | 2 -- src/amd/ci/radv-navi21-aco-fails.txt | 2 -- src/amd/ci/radv-navi21-llvm-fails.txt | 4 +--- src/amd/ci/radv-navi22-aco-fails.txt | 2 -- src/amd/ci/radv-oland-aco-fails.txt | 1 - src/amd/ci/radv-pitcairn-aco-fails.txt | 2 -- src/amd/ci/radv-polaris10-aco-fails.txt | 2 -- src/amd/ci/radv-raven-aco-fails.txt | 2 -- src/amd/ci/radv-renoir-aco-fails.txt | 2 -- src/amd/ci/radv-stoney-aco-fails.txt | 2 -- src/amd/ci/radv-vangogh-aco-fails.txt | 2 -- src/amd/ci/radv-vega10-aco-fails.txt | 2 -- src/amd/vulkan/radv_query.c | 2 -- 17 files changed, 1 insertion(+), 33 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/src/amd/ci/radv-bonaire-aco-fails.txt b/src/amd/ci/radv-bonaire-aco-fails.txt index 202d150b8b3..94f9700f66d 100644 --- a/src/amd/ci/radv-bonaire-aco-fails.txt +++ b/src/amd/ci/radv-bonaire-aco-fails.txt @@ -1,5 +1,3 @@ -dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic,Crash - dEQP-VK.api.copy_and_blit.copy_commands2.resolve_image.layer_copy_before_resolving.2_bit,Fail dEQP-VK.api.copy_and_blit.copy_commands2.resolve_image.layer_copy_before_resolving.4_bit,Fail dEQP-VK.api.copy_and_blit.copy_commands2.resolve_image.layer_copy_before_resolving.8_bit,Fail diff --git a/src/amd/ci/radv-fiji-aco-fails.txt b/src/amd/ci/radv-fiji-aco-fails.txt index 1c1b9d52ac6..dea3194a067 100644 --- a/src/amd/ci/radv-fiji-aco-fails.txt +++ b/src/amd/ci/radv-fiji-aco-fails.txt @@ -1,5 +1,3 @@ -dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic,Crash - # The following are a guess, based on polaris10 dEQP-VK.rasterization.rasterization_order_attachment_access.depth.samples_1.multi_draw_barriers,Fail dEQP-VK.rasterization.rasterization_order_attachment_access.stencil.samples_1.multi_draw_barriers,Fail 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 48a6ece1e6c..00000000000 --- a/src/amd/ci/radv-hawaii-aco-fails.txt +++ /dev/null @@ -1 +0,0 @@ -dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic,Crash diff --git a/src/amd/ci/radv-navi10-aco-fails.txt b/src/amd/ci/radv-navi10-aco-fails.txt index 08fa233ea6a..a96bcc317b7 100644 --- a/src/amd/ci/radv-navi10-aco-fails.txt +++ b/src/amd/ci/radv-navi10-aco-fails.txt @@ -1,5 +1,3 @@ -dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic,Crash - dEQP-VK.rasterization.rasterization_order_attachment_access.depth.samples_1.multi_draw_barriers,Fail dEQP-VK.rasterization.rasterization_order_attachment_access.format_float.attachments_4_samples_8.multi_draw_barriers,Fail dEQP-VK.rasterization.rasterization_order_attachment_access.format_float.attachments_8_samples_4.multi_draw_barriers,Fail diff --git a/src/amd/ci/radv-navi14-aco-fails.txt b/src/amd/ci/radv-navi14-aco-fails.txt index 49be3d99d96..6c59233bfb7 100644 --- a/src/amd/ci/radv-navi14-aco-fails.txt +++ b/src/amd/ci/radv-navi14-aco-fails.txt @@ -1,5 +1,3 @@ -dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic,Crash - # The following are a guess, based on navi10 dEQP-VK.rasterization.rasterization_order_attachment_access.depth.samples_1.multi_draw_barriers,Fail dEQP-VK.rasterization.rasterization_order_attachment_access.format_float.attachments_4_samples_8.multi_draw_barriers,Fail diff --git a/src/amd/ci/radv-navi21-aco-fails.txt b/src/amd/ci/radv-navi21-aco-fails.txt index a100c292e21..b4465c445cc 100644 --- a/src/amd/ci/radv-navi21-aco-fails.txt +++ b/src/amd/ci/radv-navi21-aco-fails.txt @@ -1,5 +1,3 @@ -dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic,Crash - dEQP-VK.rasterization.rasterization_order_attachment_access.depth.samples_1.multi_draw_barriers,Fail dEQP-VK.rasterization.rasterization_order_attachment_access.format_float.attachments_8_samples_8.multi_draw_barriers,Fail dEQP-VK.rasterization.rasterization_order_attachment_access.format_integer.attachments_8_samples_8.multi_draw_barriers,Fail diff --git a/src/amd/ci/radv-navi21-llvm-fails.txt b/src/amd/ci/radv-navi21-llvm-fails.txt index 389fddc839e..a2db4b35fb4 100644 --- a/src/amd/ci/radv-navi21-llvm-fails.txt +++ b/src/amd/ci/radv-navi21-llvm-fails.txt @@ -1,5 +1,3 @@ -dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic,Crash - dEQP-VK.rasterization.rasterization_order_attachment_access.depth.samples_1.multi_draw_barriers,Fail dEQP-VK.rasterization.rasterization_order_attachment_access.format_float.attachments_8_samples_8.multi_draw_barriers,Fail dEQP-VK.rasterization.rasterization_order_attachment_access.format_integer.attachments_8_samples_8.multi_draw_barriers,Fail @@ -259,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-navi22-aco-fails.txt b/src/amd/ci/radv-navi22-aco-fails.txt index ca2122c3b59..386c9823dae 100644 --- a/src/amd/ci/radv-navi22-aco-fails.txt +++ b/src/amd/ci/radv-navi22-aco-fails.txt @@ -1,5 +1,3 @@ -dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic,Crash - # The following are a guess, based on navi21 dEQP-VK.rasterization.rasterization_order_attachment_access.depth.samples_1.multi_draw_barriers,Fail dEQP-VK.rasterization.rasterization_order_attachment_access.format_float.attachments_8_samples_8.multi_draw_barriers,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 48a6ece1e6c..00000000000 --- a/src/amd/ci/radv-oland-aco-fails.txt +++ /dev/null @@ -1 +0,0 @@ -dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic,Crash diff --git a/src/amd/ci/radv-pitcairn-aco-fails.txt b/src/amd/ci/radv-pitcairn-aco-fails.txt index 4c2e5ee0689..e180808a7fe 100644 --- a/src/amd/ci/radv-pitcairn-aco-fails.txt +++ b/src/amd/ci/radv-pitcairn-aco-fails.txt @@ -1,5 +1,3 @@ -dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic,Crash - dEQP-VK.api.copy_and_blit.copy_commands2.resolve_image.layer_copy_before_resolving.2_bit,Fail dEQP-VK.api.copy_and_blit.copy_commands2.resolve_image.layer_copy_before_resolving.4_bit,Fail dEQP-VK.api.copy_and_blit.copy_commands2.resolve_image.layer_copy_before_resolving.8_bit,Fail diff --git a/src/amd/ci/radv-polaris10-aco-fails.txt b/src/amd/ci/radv-polaris10-aco-fails.txt index 164f166567e..373b197078e 100644 --- a/src/amd/ci/radv-polaris10-aco-fails.txt +++ b/src/amd/ci/radv-polaris10-aco-fails.txt @@ -1,5 +1,3 @@ -dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic,Crash - dEQP-VK.api.copy_and_blit.copy_commands2.depth_stencil_msaa_copy.array_to_array.d32_sfloat_D_4_bit,Fail dEQP-VK.api.copy_and_blit.copy_commands2.depth_stencil_msaa_copy.array_to_array.d32_sfloat_D_8_bit,Fail dEQP-VK.api.copy_and_blit.core.depth_stencil_msaa_copy.array_to_array.d32_sfloat_D_4_bit,Fail diff --git a/src/amd/ci/radv-raven-aco-fails.txt b/src/amd/ci/radv-raven-aco-fails.txt index e442f214e34..c4205cd0d89 100644 --- a/src/amd/ci/radv-raven-aco-fails.txt +++ b/src/amd/ci/radv-raven-aco-fails.txt @@ -1,5 +1,3 @@ -dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic,Crash - # The following are a guess, based on Renoir dEQP-VK.rasterization.rasterization_order_attachment_access.depth.samples_1.multi_draw_barriers,Fail dEQP-VK.rasterization.rasterization_order_attachment_access.format_float.attachments_4_samples_2.multi_draw_barriers,Fail diff --git a/src/amd/ci/radv-renoir-aco-fails.txt b/src/amd/ci/radv-renoir-aco-fails.txt index 29a00f77236..d465a85ba90 100644 --- a/src/amd/ci/radv-renoir-aco-fails.txt +++ b/src/amd/ci/radv-renoir-aco-fails.txt @@ -1,5 +1,3 @@ -dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic,Crash - dEQP-VK.api.copy_and_blit.copy_commands2.resolve_image.diff_layout_copy_before_resolving.4_bit_general_general,Fail dEQP-VK.api.copy_and_blit.copy_commands2.resolve_image.diff_layout_copy_before_resolving.4_bit_transfer_src_optimal_general,Fail dEQP-VK.api.copy_and_blit.copy_commands2.resolve_image.diff_layout_copy_before_resolving.8_bit_general_general,Fail diff --git a/src/amd/ci/radv-stoney-aco-fails.txt b/src/amd/ci/radv-stoney-aco-fails.txt index c331bce26c7..021fb003744 100644 --- a/src/amd/ci/radv-stoney-aco-fails.txt +++ b/src/amd/ci/radv-stoney-aco-fails.txt @@ -1,5 +1,3 @@ -dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic,Crash - dEQP-VK.api.image_clearing.core.clear_depth_stencil_attachment.multiple_layers.d16_unorm_s8_uint_1x33,Fail dEQP-VK.api.image_clearing.core.clear_depth_stencil_attachment.multiple_layers.d16_unorm_s8_uint_separate_layouts_stencil_1x33,Fail dEQP-VK.api.image_clearing.core.clear_depth_stencil_attachment.multiple_layers.d32_sfloat_s8_uint_1x33,Fail diff --git a/src/amd/ci/radv-vangogh-aco-fails.txt b/src/amd/ci/radv-vangogh-aco-fails.txt index abccf878acf..0a731d58b16 100644 --- a/src/amd/ci/radv-vangogh-aco-fails.txt +++ b/src/amd/ci/radv-vangogh-aco-fails.txt @@ -1,5 +1,3 @@ -dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic,Crash - dEQP-VK.rasterization.rasterization_order_attachment_access.depth.samples_1.multi_draw_barriers,Fail dEQP-VK.rasterization.rasterization_order_attachment_access.format_float.attachments_4_samples_8.multi_draw_barriers,Fail dEQP-VK.rasterization.rasterization_order_attachment_access.format_float.attachments_8_samples_4.multi_draw_barriers,Fail diff --git a/src/amd/ci/radv-vega10-aco-fails.txt b/src/amd/ci/radv-vega10-aco-fails.txt index 5294340b264..0ef50eecee9 100644 --- a/src/amd/ci/radv-vega10-aco-fails.txt +++ b/src/amd/ci/radv-vega10-aco-fails.txt @@ -1,5 +1,3 @@ -dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic,Crash - dEQP-VK.api.copy_and_blit.copy_commands2.resolve_image.diff_layout_copy_before_resolving.4_bit_general_general,Fail dEQP-VK.api.copy_and_blit.copy_commands2.resolve_image.diff_layout_copy_before_resolving.4_bit_transfer_src_optimal_general,Fail dEQP-VK.api.copy_and_blit.copy_commands2.resolve_image.diff_layout_copy_before_resolving.8_bit_general_general,Fail 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);