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 <samuel.pitoiset@gmail.com>
Reviewed-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17952>

diff --git a/src/amd/ci/radv-bonaire-aco-fails.txt b/src/amd/ci/radv-bonaire-aco-fails.txt
index 202d150..94f9700 100644 (file)
--- 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 1c1b9d5..dea3194 100644 (file)
--- 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 (file)
index 48a6ece..0000000
--- 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 08fa233..a96bcc3 100644 (file)
--- 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 49be3d9..6c59233 100644 (file)
--- 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 a100c29..b4465c4 100644 (file)
--- 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 389fddc..a2db4b3 100644 (file)
--- 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 ca2122c..386c982 100644 (file)
--- 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 (file)
index 48a6ece..0000000
--- 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 4c2e5ee..e180808 100644 (file)
--- 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 164f166..373b197 100644 (file)
--- 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 e442f21..c4205cd 100644 (file)
--- 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 29a00f7..d465a85 100644 (file)
--- 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 c331bce..021fb00 100644 (file)
--- 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 abccf87..0a731d5 100644 (file)
--- 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 5294340..0ef50ee 100644 (file)
--- 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 6fea696..eebab10 100644 (file)
--- 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);