GitHub/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-12-28 21:15:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Check FenceCycle signalled flag immediately before waiting

Browse Source 
The lock release within the wait for submission means that another thread could end up signalling the cycle and then the VK wait still happen after when the lock has been reacquired.
This commit is contained in:
Billy Laws 2022-10-22 13:25:51 +01:00
parent 1a23b929a7
commit 95d849e1f6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/cpp/skyline/gpu/fence_cycle.h
View File

@ -132,14 +132,15 @@ namespace skyline::gpu {
});
std::unique_lock lock{mutex};
submitCondition.wait(lock, [&] { return submitted; });
if (signalled.test(std::memory_order_relaxed)) {
if (shouldDestroy)
DestroyDependencies();
return;
}
submitCondition.wait(lock, [&] { return submitted; });
vk::Result waitResult;
while ((waitResult = (*device).waitForFences(1, &fence, false, std::numeric_limits<u64>::max(), *device.getDispatcher())) != vk::Result::eSuccess) {
if (waitResult == vk::Result::eTimeout)
@ -227,7 +228,7 @@ namespace skyline::gpu {
* @param cycle The cycle to chain to this one, this is nullable and this function will be a no-op if this is nullptr
*/
void ChainCycle(const std::shared_ptr<FenceCycle> &cycle) {
if (cycle && !signalled.test(std::memory_order_consume) && cycle.get() != this)
if (cycle && !signalled.test(std::memory_order_consume) && cycle.get() != this && !cycle->Poll())
chainedCycles.Append(cycle); // If the cycle isn't the current cycle or already signalled, we need to chain it
}