From 197e3f710911c9e1d459dca22cfe78920dc8becb Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Sun, 24 Mar 2024 20:02:53 +0000 Subject: [PATCH] v3dv/ci: assume list of dEQP-VK.wsi.*.maintenance1.present_modes.* flakes is the same between xcb & xlib and between rpi4 & rpi5 Part-of: --- src/broadcom/ci/broadcom-rpi4-flakes.txt | 21 ++++++++++++--------- src/broadcom/ci/broadcom-rpi5-flakes.txt | 17 ++++++++++++----- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/broadcom/ci/broadcom-rpi4-flakes.txt b/src/broadcom/ci/broadcom-rpi4-flakes.txt index c3f5f194706..e392aebb6d3 100644 --- a/src/broadcom/ci/broadcom-rpi4-flakes.txt +++ b/src/broadcom/ci/broadcom-rpi4-flakes.txt @@ -52,11 +52,6 @@ dEQP-VK.wsi.wayland.incremental_present.scale_none.immediate.identity.inherit.in dEQP-VK.wsi.wayland.shared_presentable_image.scale_none.inherit.inherit.continuous dEQP-VK.wsi.xcb.incremental_present.scale_none.fifo_relaxed.identity.opaque.incremental_present dEQP-VK.wsi.xcb.maintenance1.present_fence.fifo.ordering -dEQP-VK.wsi.xcb.maintenance1.present_modes.fifo_relaxed.query -dEQP-VK.wsi.xcb.maintenance1.present_modes.heterogenous.fifo_fifo_mailbox -dEQP-VK.wsi.xcb.maintenance1.present_modes.heterogenous.fifo_fifo_relaxed_immediate -dEQP-VK.wsi.xcb.maintenance1.present_modes.heterogenous.fifo_relaxed_immediate_fifo_relaxed -dEQP-VK.wsi.xcb.maintenance1.present_modes.mailbox.query dEQP-VK.wsi.xcb.maintenance1.scaling.continuous.one_to_one.max_min.swapchain_smaller_same_aspect dEQP-VK.wsi.xcb.maintenance1.scaling.demand.aspect_stretch.center_min.swapchain_smaller_same_aspect dEQP-VK.wsi.xcb.maintenance1.scaling.fifo_relaxed.one_to_one.max_min.swapchain_wider @@ -77,10 +72,6 @@ dEQP-VK.wsi.xcb.maintenance1.scaling.resize_window.mailbox.aspect_stretch.center dEQP-VK.wsi.xcb.maintenance1.scaling.resize_window.mailbox.aspect_stretch.min_min.swapchain_smaller_wider_aspect dEQP-VK.wsi.xlib.incremental_present.scale_none.fifo.identity.opaque.incremental_present dEQP-VK.wsi.xlib.maintenance1.present_fence.mailbox.multi_swapchain -dEQP-VK.wsi.xlib.maintenance1.present_modes.heterogenous.fifo_fifo_fifo_relaxed -dEQP-VK.wsi.xlib.maintenance1.present_modes.heterogenous.fifo_relaxed_fifo_mailbox -dEQP-VK.wsi.xlib.maintenance1.present_modes.heterogenous.immediate_fifo_mailbox -dEQP-VK.wsi.xlib.maintenance1.present_modes.heterogenous.immediate_immediate_fifo dEQP-VK.wsi.xlib.maintenance1.scaling.fifo.one_to_one.center_max.swapchain_smaller_same_aspect dEQP-VK.wsi.xlib.swapchain.get_images.incomplete dEQP-VK.wsi.xlib.swapchain.private_data.min_image_count @@ -88,3 +79,15 @@ dEQP-VK.wsi.xlib.swapchain.private_data.min_image_count dEQP-VK.wsi.*.maintenance1.deferred_alloc.immediate.basic dEQP-VK.wsi.*.maintenance1.deferred_alloc.immediate.bind_image_multi_swapchain dEQP-VK.wsi.*.maintenance1.deferred_alloc.mailbox.bind_image_multi_swapchain + +dEQP-VK.wsi.(xcb|xlib).maintenance1.present_modes.fifo_relaxed.change_modes_with_deferred_alloc +dEQP-VK.wsi.(xcb|xlib).maintenance1.present_modes.fifo_relaxed.query +dEQP-VK.wsi.(xcb|xlib).maintenance1.present_modes.heterogenous.fifo_fifo_fifo_relaxed +dEQP-VK.wsi.(xcb|xlib).maintenance1.present_modes.heterogenous.fifo_fifo_mailbox +dEQP-VK.wsi.(xcb|xlib).maintenance1.present_modes.heterogenous.fifo_fifo_relaxed_immediate +dEQP-VK.wsi.(xcb|xlib).maintenance1.present_modes.heterogenous.fifo_mailbox_mailbox +dEQP-VK.wsi.(xcb|xlib).maintenance1.present_modes.heterogenous.fifo_relaxed_fifo_mailbox +dEQP-VK.wsi.(xcb|xlib).maintenance1.present_modes.heterogenous.fifo_relaxed_immediate_fifo_relaxed +dEQP-VK.wsi.(xcb|xlib).maintenance1.present_modes.heterogenous.immediate_fifo_mailbox +dEQP-VK.wsi.(xcb|xlib).maintenance1.present_modes.heterogenous.immediate_immediate_fifo +dEQP-VK.wsi.(xcb|xlib).maintenance1.present_modes.mailbox.query diff --git a/src/broadcom/ci/broadcom-rpi5-flakes.txt b/src/broadcom/ci/broadcom-rpi5-flakes.txt index 57d8b6d94b6..08e735a490d 100644 --- a/src/broadcom/ci/broadcom-rpi5-flakes.txt +++ b/src/broadcom/ci/broadcom-rpi5-flakes.txt @@ -11,12 +11,19 @@ dEQP-VK.texture.shadow.cube.linear.less_d24_unorm_s8_uint dEQP-VK.wsi.wayland.shared_presentable_image.scale_none.inherit.pre_multiplied.continuous dEQP-VK.wsi.xcb.maintenance1.present_fence.mailbox.mult_swapchain_ordering dEQP-VK.wsi.xcb.maintenance1.present_fence.mailbox.multi_swapchain -dEQP-VK.wsi.xcb.maintenance1.present_modes.fifo_relaxed.change_modes_with_deferred_alloc -dEQP-VK.wsi.xcb.maintenance1.present_modes.heterogenous.fifo_fifo_mailbox -dEQP-VK.wsi.xcb.maintenance1.present_modes.mailbox.query dEQP-VK.wsi.xcb.maintenance1.scaling.continuous.one_to_one.min_min.swapchain_bigger_wider_aspect dEQP-VK.wsi.xcb.maintenance1.scaling.demand.aspect_stretch.min_max.swapchain_bigger_taller_aspect dEQP-VK.wsi.xcb.maintenance1.scaling.resize_window.continuous.one_to_one.min_max.swapchain_smaller_same_aspect dEQP-VK.wsi.xcb.maintenance1.scaling.resize_window.fifo_relaxed.aspect_stretch.center_max.swapchain_smaller_taller_aspect -dEQP-VK.wsi.xlib.maintenance1.present_modes.heterogenous.fifo_mailbox_mailbox -dEQP-VK.wsi.xlib.maintenance1.present_modes.heterogenous.immediate_fifo_mailbox + +dEQP-VK.wsi.(xcb|xlib).maintenance1.present_modes.fifo_relaxed.change_modes_with_deferred_alloc +dEQP-VK.wsi.(xcb|xlib).maintenance1.present_modes.fifo_relaxed.query +dEQP-VK.wsi.(xcb|xlib).maintenance1.present_modes.heterogenous.fifo_fifo_fifo_relaxed +dEQP-VK.wsi.(xcb|xlib).maintenance1.present_modes.heterogenous.fifo_fifo_mailbox +dEQP-VK.wsi.(xcb|xlib).maintenance1.present_modes.heterogenous.fifo_fifo_relaxed_immediate +dEQP-VK.wsi.(xcb|xlib).maintenance1.present_modes.heterogenous.fifo_mailbox_mailbox +dEQP-VK.wsi.(xcb|xlib).maintenance1.present_modes.heterogenous.fifo_relaxed_fifo_mailbox +dEQP-VK.wsi.(xcb|xlib).maintenance1.present_modes.heterogenous.fifo_relaxed_immediate_fifo_relaxed +dEQP-VK.wsi.(xcb|xlib).maintenance1.present_modes.heterogenous.immediate_fifo_mailbox +dEQP-VK.wsi.(xcb|xlib).maintenance1.present_modes.heterogenous.immediate_immediate_fifo +dEQP-VK.wsi.(xcb|xlib).maintenance1.present_modes.mailbox.query