From 262e7feab91be0ffcfa24db9fff14a8d3eb9a96f Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Fri, 13 Feb 2026 14:46:30 -0500 Subject: [PATCH] panvk/jm: Refactor BeginRendering() The old code was all out of order and made no sense. There's a reason it made no sense. It was wrong. Cleaning this up fixes a solid 1/3 of the remaining Bifrost CTS fails in CI. Cc: mesa-stable Reviewed-by: Lars-Ivar Hesselberg Simonsen Acked-by: Boris Brezillon Acked-by: Eric R. Smith (cherry picked from commit 962d1f33e17cd639e69b4bd8caa21e904a6a1c46) Part-of: --- .pick_status.json | 2 +- src/panfrost/ci/panfrost-g52-fails.txt | 221 --------------------- src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c | 28 +-- 3 files changed, 15 insertions(+), 236 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 7e7e188b59b..f7d0ca6194a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1194,7 +1194,7 @@ "description": "panvk/jm: Refactor BeginRendering()", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/panfrost/ci/panfrost-g52-fails.txt b/src/panfrost/ci/panfrost-g52-fails.txt index 4ecbe91052c..e1969ea188f 100644 --- a/src/panfrost/ci/panfrost-g52-fails.txt +++ b/src/panfrost/ci/panfrost-g52-fails.txt @@ -341,17 +341,6 @@ dEQP-VK.api.copy_and_blit.core.resolve_image.copy_with_regions_before_resolving. dEQP-VK.api.copy_and_blit.copy_commands2.resolve_image.whole_copy_before_resolving_no_cab.4_bit,Fail dEQP-VK.api.copy_and_blit.copy_commands2.resolve_image.copy_with_regions_before_resolving.4_bit,Fail -dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.2_cmdbuffers_resuming,Fail -dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.2_secondary_2_primary_cmdbuffers_resuming,Fail -dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.2_secondary_cmdbuffers_resuming,Fail -dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.contents_2_primary_secondary_cmdbuffers_resuming,Fail -dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.contents_2_secondary_2_primary_cmdbuffers_resuming,Fail -dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.contents_2_secondary_cmdbuffers_resuming,Fail -dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.contents_primary_secondary_cmdbuffers_resuming,Fail -dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.contents_secondary_2_primary_cmdbuffers_resuming,Fail -dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.contents_secondary_primary_cmdbuffers_resuming,Fail -dEQP-VK.dynamic_rendering.primary_cmd_buff.basic.single_cmdbuffer_resuming,Fail - # New fails in 1.4.3.3 dEQP-VK.pipeline.fast_linked_library.empty_fs.masked_samples,Fail dEQP-VK.pipeline.monolithic.empty_fs.masked_samples,Fail @@ -365,213 +354,3 @@ dEQP-VK.pipeline.fast_linked_library.vertex_input.misc.unbound_input,Crash dEQP-VK.pipeline.fast_linked_library.vertex_input.misc.unbound_input_dynamic,Crash dEQP-VK.pipeline.monolithic.vertex_input.misc.unbound_input,Crash dEQP-VK.pipeline.monolithic.vertex_input.misc.unbound_input_dynamic,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.basic.2_cmdbuffers_resuming,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.basic.2_secondary_2_primary_cmdbuffers_resuming,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.basic.2_secondary_cmdbuffers_resuming,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.basic.contents_2_primary_secondary_cmdbuffers_resuming,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.basic.contents_2_secondary_2_primary_cmdbuffers_resuming,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.basic.contents_2_secondary_cmdbuffers_resuming,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.basic.contents_primary_secondary_cmdbuffers_resuming,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.basic.contents_secondary_2_primary_cmdbuffers_resuming,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.basic.contents_secondary_primary_cmdbuffers_resuming,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.basic.single_cmdbuffer_resuming,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed0,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed0_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed10,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed10_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed11,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed11_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed12,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed12_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed13,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed13_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed14,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed14_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed15,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed15_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed16,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed16_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed17,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed17_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed18,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed18_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed19,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed19_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed1,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed1_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed20,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed20_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed21,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed21_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed22,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed22_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed23,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed23_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed24,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed24_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed25,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed25_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed26,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed26_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed27,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed27_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed28,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed28_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed29,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed29_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed2,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed2_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed30,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed30_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed31,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed31_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed32,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed32_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed33,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed33_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed34,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed34_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed35,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed35_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed36,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed36_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed37,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed37_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed38,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed38_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed39,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed39_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed3,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed3_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed40,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed40_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed41,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed41_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed42,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed42_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed43,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed43_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed44,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed44_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed45,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed45_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed46,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed46_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed47,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed47_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed48,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed48_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed49,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed49_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed4,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed4_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed50,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed50_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed51,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed51_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed52,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed52_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed53,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed53_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed54,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed54_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed55,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed55_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed56,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed56_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed57,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed57_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed58,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed58_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed59,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed59_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed5,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed5_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed60,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed60_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed61,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed61_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed62,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed62_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed63,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed63_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed64,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed64_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed65,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed65_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed66,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed66_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed67,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed67_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed68,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed68_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed69,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed69_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed6,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed6_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed70,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed70_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed71,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed71_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed72,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed72_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed73,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed73_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed74,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed74_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed75,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed75_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed76,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed76_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed77,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed77_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed78,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed78_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed79,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed79_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed7,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed7_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed80,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed80_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed81,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed81_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed82,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed82_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed83,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed83_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed84,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed84_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed85,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed85_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed86,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed86_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed87,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed87_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed88,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed88_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed89,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed89_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed8,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed8_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed90,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed90_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed91,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed91_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed92,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed92_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed93,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed93_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed94,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed94_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed95,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed95_multiview,Crash -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed96,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed96_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed97,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed97_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed98,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed98_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed99,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed99_multiview,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed9,Fail -dEQP-VK.renderpasses.dynamic_rendering.primary_cmd_buff.random.seed9_multiview,Crash diff --git a/src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c b/src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c index 0c04b58977d..47004c3fe96 100644 --- a/src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c +++ b/src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c @@ -1946,25 +1946,25 @@ panvk_per_arch(CmdBeginRendering)(VkCommandBuffer commandBuffer, { VK_FROM_HANDLE(panvk_cmd_buffer, cmdbuf, commandBuffer); struct panvk_cmd_graphics_state *state = &cmdbuf->state.gfx; - bool resuming = cmdbuf->state.gfx.render.flags & VK_RENDERING_RESUMING_BIT; + bool resuming = pRenderingInfo->flags & VK_RENDERING_RESUMING_BIT; /* When resuming from a suspended pass, the state should be unchanged. */ - if (resuming) + if (resuming && cmdbuf->cur_batch) { state->render.flags = pRenderingInfo->flags; - else + } else { + /* If we're not resuming, cur_batch should be NULL. However, this + * currently isn't true because of how events are implemented. + * + * XXX: Rewrite events to not close and open batch and add an assert here. + */ + if (cmdbuf->cur_batch) + panvk_per_arch(cmd_close_batch)(cmdbuf); + panvk_per_arch(cmd_init_render_state)(cmdbuf, pRenderingInfo); - /* If we're not resuming, cur_batch should be NULL. - * However, this currently isn't true because of how events are implemented. - * XXX: Rewrite events to not close and open batch and add an assert here. - */ - if (cmdbuf->cur_batch && !resuming) - panvk_per_arch(cmd_close_batch)(cmdbuf); - - /* The opened batch might have been disrupted by a compute job. - * We need to preload in that case. */ - if (resuming && !cmdbuf->cur_batch) - panvk_per_arch(cmd_preload_fb_after_batch_split)(cmdbuf); + if (resuming) + panvk_per_arch(cmd_preload_fb_after_batch_split)(cmdbuf); + } if (!cmdbuf->cur_batch) panvk_per_arch(cmd_open_batch)(cmdbuf);