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)

.github/workflows/canary.yml

@@ -50,7 +50,7 @@ jobs:
       - name: Install gli
         run: |
           mkdir -p $HOME/.bin
-          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64' 2.0.30
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64' 2.0.31
           chmod +x gli
           mv gli $HOME/.bin/
           echo "$HOME/.bin" >> $GITHUB_PATH

.github/workflows/release.yml

@@ -44,7 +44,7 @@ jobs:
       - name: Install gli
         run: |
           mkdir -p $HOME/.bin
-          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64' 2.0.30
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64' 2.0.31
           chmod +x gli
           mv gli $HOME/.bin/
           echo "$HOME/.bin" >> $GITHUB_PATH

src/Ryujinx.Graphics.Vulkan/Queries/BufferedQuery.cs

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