From 78fb6d8042793eb2135ff77abf1e7a8229e684f7 Mon Sep 17 00:00:00 2001 From: dantdmdarealguy Date: Tue, 27 Oct 2026 09:58:34 -0500 Subject: [PATCH] test(videoout): expect ordered CPU flips in timing log builds With APS5_ENABLE_TIMING_LOG the driver queues every CPU flip behind queue-0 work (Submission.cpp, #6507), so the flip's frame timing collects the submissions ahead of it. testCpuFlipOrder only expected that order with APS5_CPU_FLIP_IN_ORDER, so video_out_flip_cpuflip failed in every timing log build. --- core/libs/prx/libSceVideoOut/tests/Flip.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/libs/prx/libSceVideoOut/tests/Flip.cpp b/core/libs/prx/libSceVideoOut/tests/Flip.cpp index ca0ae05f8a..86440b293d 100644 --- a/core/libs/prx/libSceVideoOut/tests/Flip.cpp +++ b/core/libs/prx/libSceVideoOut/tests/Flip.cpp @@ -224,7 +224,7 @@ void testDeferredBuffer() { } void testCpuFlipOrder() { - const bool inOrder = std::getenv("APS5_CPU_FLIP_IN_ORDER") != nullptr; + const bool inOrder = APS5_ENABLE_TIMING_LOG || std::getenv("APS5_CPU_FLIP_IN_ORDER") != nullptr; const int handle = sceVideoOutOpen(255, 0, 0, nullptr); auto cfg = VideoOutDriver::Get().GetConfig(handle); std::vector allocation(65536 + 65535); @@ -251,7 +251,7 @@ void testCpuFlipOrder() { std::thread flipThread([&] { check(sceVideoOutSubmitFlip(handle, 0, 1, 5) == 0, "the flip thread's flip was not accepted"); }); flipThread.join(); const bool ahead = flipsWithin(1, std::chrono::milliseconds(inOrder ? 1000 : 8000)); - if (inOrder) check(!ahead, "with APS5_CPU_FLIP_IN_ORDER a flip completed while a queue-0 submission ahead of it was held"); + if (inOrder) check(!ahead, "with CPU flips in order a flip completed while a queue-0 submission ahead of it was held"); else check(ahead, "a flip from a thread that never submitted queue-0 work waited for a held queue-0 submission"); first->Release(); check(flipsWithin(1, std::chrono::seconds(30)), "the flip thread's flip did not complete");