mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure locks are released if exceptions are thrown

Browse source
This commit is contained in:
Gabriel A 2024-07-06 11:52:42 -03:00
commit 0bdf655e2f
2 changed files with 42 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/Ryujinx.Graphics.Vulkan/FenceHolder.cs
View file

@ -107,31 +107,44 @@ namespace Ryujinx.Graphics.Vulkan
if (_concurrentWaitUnsupported) if (_concurrentWaitUnsupported)
{ {
AcquireLock(); AcquireLock();
try
{
FenceHelper.WaitAllIndefinitely(_api, _device, stackalloc Fence[] { _fence });
}
finally
{
ReleaseLock();
}
} }
else
FenceHelper.WaitAllIndefinitely(_api, _device, stackalloc Fence[] { _fence });
if (_concurrentWaitUnsupported)
{ {
ReleaseLock(); FenceHelper.WaitAllIndefinitely(_api, _device, stackalloc Fence[] { _fence });
} }
} }
public bool IsSignaled() public bool IsSignaled()
{ {
if (_concurrentWaitUnsupported && !TryAcquireLock())
{
return false;
}
bool result = FenceHelper.AllSignaled(_api, _device, stackalloc Fence[] { _fence });
if (_concurrentWaitUnsupported) if (_concurrentWaitUnsupported)
{ {
ReleaseLock(); if (!TryAcquireLock())
} {
return false;
}
return result; try
{
return FenceHelper.AllSignaled(_api, _device, stackalloc Fence[] { _fence });
}
finally
{
ReleaseLock();
}
}
else
{
return FenceHelper.AllSignaled(_api, _device, stackalloc Fence[] { _fence });
}
} }
public void Dispose() public void Dispose()

23
src/Ryujinx.Graphics.Vulkan/MultiFenceHolder.cs
View file

@ -196,18 +196,23 @@ namespace Ryujinx.Graphics.Vulkan
bool signaled = true; bool signaled = true;
if (hasTimeout) try
{ {
signaled = FenceHelper.AllSignaled(api, device, fences[..fenceCount], timeout); if (hasTimeout)
{
signaled = FenceHelper.AllSignaled(api, device, fences[..fenceCount], timeout);
}
else
{
FenceHelper.WaitAllIndefinitely(api, device, fences[..fenceCount]);
}
} }
else finally
{ {
FenceHelper.WaitAllIndefinitely(api, device, fences[..fenceCount]); for (int i = 0; i < fenceCount; i++)
} {
fenceHolders[i].PutLock();
for (int i = 0; i < fenceCount; i++) }
{
fenceHolders[i].PutLock();
} }
return signaled; return signaled;