marcel/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2025-08-12 05:05:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Disallow concurrent fence waits on Adreno (#7001)

Browse Source 
* Disallow concurrent fence waits on Adreno

* Ensure locks are released if exceptions are thrown
This commit is contained in:
gdkchan
2024-07-07 19:33:28 -03:00
committed by GitHub
parent cfc75d7e78
commit a830eb666b
5 changed files with 108 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/Ryujinx.Graphics.Vulkan/FenceHolder.cs
View File

@@ -10,12 +10,15 @@ namespace Ryujinx.Graphics.Vulkan
private readonly Device _device;
private Fence _fence;
private int _referenceCount;
private int _lock;
private readonly bool _concurrentWaitUnsupported;
private bool _disposed;
public unsafe FenceHolder(Vk api, Device device)
public unsafe FenceHolder(Vk api, Device device, bool concurrentWaitUnsupported)
{
_api = api;
_device = device;
_concurrentWaitUnsupported = concurrentWaitUnsupported;
var fenceCreateInfo = new FenceCreateInfo
{
@@ -47,6 +50,11 @@ namespace Ryujinx.Graphics.Vulkan
}
while (Interlocked.CompareExchange(ref _referenceCount, lastValue + 1, lastValue) != lastValue);
if (_concurrentWaitUnsupported)
{
AcquireLock();
}
fence = _fence;
return true;
}
@@ -57,6 +65,16 @@ namespace Ryujinx.Graphics.Vulkan
return _fence;
}
public void PutLock()
{
Put();
if (_concurrentWaitUnsupported)
{
ReleaseLock();
}
}
public void Put()
{
if (Interlocked.Decrement(ref _referenceCount) == 0)
@@ -66,24 +84,67 @@ namespace Ryujinx.Graphics.Vulkan
}
}
private void AcquireLock()
{
while (!TryAcquireLock())
{
Thread.SpinWait(32);
}
}
private bool TryAcquireLock()
{
return Interlocked.Exchange(ref _lock, 1) == 0;
}
private void ReleaseLock()
{
Interlocked.Exchange(ref _lock, 0);
}
public void Wait()
{
Span<Fence> fences = stackalloc Fence[]
if (_concurrentWaitUnsupported)
{
_fence,
};
AcquireLock();
FenceHelper.WaitAllIndefinitely(_api, _device, fences);
try
{
FenceHelper.WaitAllIndefinitely(_api, _device, stackalloc Fence[] { _fence });
}
finally
{
ReleaseLock();
}
}
else
{
FenceHelper.WaitAllIndefinitely(_api, _device, stackalloc Fence[] { _fence });
}
}
public bool IsSignaled()
{
Span<Fence> fences = stackalloc Fence[]
if (_concurrentWaitUnsupported)
{
_fence,
};
if (!TryAcquireLock())
{
return false;
}
return FenceHelper.AllSignaled(_api, _device, fences);
try
{
return FenceHelper.AllSignaled(_api, _device, stackalloc Fence[] { _fence });
}
finally
{
ReleaseLock();
}
}
else
{
return FenceHelper.AllSignaled(_api, _device, stackalloc Fence[] { _fence });
}
}
public void Dispose()