Merge branch 'master' into 'master'

Fixed macOS random freezing at character selection screen of Super Mario Party Jamboree

See merge request [ryubing/ryujinx!239](https://git.ryujinx.app/ryubing/ryujinx/-/merge_requests/239)
This commit is contained in:
BXYMartin
2026-04-02 05:11:49 -05:00

View File

@@ -145,22 +145,13 @@ namespace Ryujinx.Graphics.Vulkan.Queries
{ {
long data = _defaultValue; long data = _defaultValue;
if (wakeSignal == null)
{
while (WaitingForValue(data))
{
data = Marshal.ReadInt64(_bufferMap);
}
}
else
{
int iterations = 0; int iterations = 0;
while (WaitingForValue(data) && iterations++ < MaxQueryRetries) while (WaitingForValue(data) && iterations++ < MaxQueryRetries)
{ {
data = Marshal.ReadInt64(_bufferMap); data = Marshal.ReadInt64(_bufferMap);
if (WaitingForValue(data)) if (wakeSignal != null && WaitingForValue(data))
{ {
wakeSignal.WaitOne(1); wakeSignal.WaitOne(0);
} }
} }
@@ -168,7 +159,6 @@ namespace Ryujinx.Graphics.Vulkan.Queries
{ {
Logger.Error?.Print(LogClass.Gpu, $"Error: Query result {_type} timed out. Took more than {MaxQueryRetries} tries."); Logger.Error?.Print(LogClass.Gpu, $"Error: Query result {_type} timed out. Took more than {MaxQueryRetries} tries.");
} }
}
return data; return data;
} }