fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 06:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
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>
This commit is contained in:
Samuel Pitoiset 2022-08-09 10:53:02 +02:00 • committed by Marge Bot
parent 5b5d5554f6
commit 37dfa4e3f3
17 changed files with 1 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/amd/ci/radv-bonaire-aco-fails.txt
View file

@ -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

2
src/amd/ci/radv-fiji-aco-fails.txt
View file

@ -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

1
src/amd/ci/radv-hawaii-aco-fails.txt
View file

@ -1 +0,0 @@
dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic,Crash

2
src/amd/ci/radv-navi10-aco-fails.txt
View file

@ -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

2
src/amd/ci/radv-navi14-aco-fails.txt
View file

@ -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

2
src/amd/ci/radv-navi21-aco-fails.txt
View file

@ -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

4
src/amd/ci/radv-navi21-llvm-fails.txt
View file

@ -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
dEQP-VK.draw.renderpass.shader_invocation.helper_invocation,Fail

2
src/amd/ci/radv-navi22-aco-fails.txt
View file

@ -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

1
src/amd/ci/radv-oland-aco-fails.txt
View file

@ -1 +0,0 @@
dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail.basic,Crash

2
src/amd/ci/radv-pitcairn-aco-fails.txt
View file

@ -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

2
src/amd/ci/radv-polaris10-aco-fails.txt
View file

@ -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

2
src/amd/ci/radv-raven-aco-fails.txt
View file

@ -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

2
src/amd/ci/radv-renoir-aco-fails.txt
View file

@ -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

2
src/amd/ci/radv-stoney-aco-fails.txt
View file

@ -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

2
src/amd/ci/radv-vangogh-aco-fails.txt
View file

@ -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

2
src/amd/ci/radv-vega10-aco-fails.txt
View file

@ -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

2
src/amd/vulkan/radv_query.c
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);