Vulkan: Fix barrier batching past limit (#6339)

If more than 16 barriers were queued at one time, the _queuedBarrierCount would no longer match the number of remaining barriers, because when breaking out of the loop consuming them it deleted all barriers, not just the 16 that were consumed.

Should fix freezes that started occurring with #6240. Fixes issue #6338.
This commit is contained in:
riperiperi 2024-02-22 02:41:08 +00:00 committed by GitHub
parent 6f5fcb7970
commit 4f63782bac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -95,6 +95,7 @@ namespace Ryujinx.Graphics.Vulkan
List<BarrierWithStageFlags<T>> list) where T : unmanaged
{
int firstMatch = -1;
int end = list.Count;
for (int i = 0; i < list.Count; i++)
{
@ -111,6 +112,7 @@ namespace Ryujinx.Graphics.Vulkan
if (count >= target.Length)
{
end = i + 1;
break;
}
}
@ -128,6 +130,7 @@ namespace Ryujinx.Graphics.Vulkan
if (count >= target.Length)
{
end = i + 1;
break;
}
}
@ -146,13 +149,13 @@ namespace Ryujinx.Graphics.Vulkan
}
}
if (firstMatch == 0)
if (firstMatch == 0 && end == list.Count)
{
list.Clear();
}
else if (firstMatch != -1)
{
int deleteCount = list.Count - firstMatch;
int deleteCount = end - firstMatch;
list.RemoveRange(firstMatch, deleteCount);
}