Attempt 1

This PR contains the following updates:

| Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) |
|---|---|---|---|
| [Avalonia](https://avaloniaui.net/?utm_source=nuget&utm_medium=referral&utm_content=project_homepage_link) ([source](https://github.com/AvaloniaUI/Avalonia)) | `11.3.14` → `11.3.15` | ![age](https://developer.mend.io/api/mc/badges/age/nuget/Avalonia/11.3.15?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/nuget/Avalonia/11.3.14/11.3.15?slim=true) |
| [Avalonia.Desktop](https://avaloniaui.net/?utm_source=nuget&utm_medium=referral&utm_content=project_homepage_link) ([source](https://github.com/AvaloniaUI/Avalonia)) | `11.3.14` → `11.3.15` | ![age](https://developer.mend.io/api/mc/badges/age/nuget/Avalonia.Desktop/11.3.15?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/nuget/Avalonia.Desktop/11.3.14/11.3.15?slim=true) |
| [Avalonia.Diagnostics](https://avaloniaui.net/?utm_source=nuget&utm_medium=referral&utm_content=project_homepage_link) ([source](https://github.com/AvaloniaUI/Avalonia)) | `11.3.14` → `11.3.15` | ![age](https://developer.mend.io/api/mc/badges/age/nuget/Avalonia.Diagnostics/11.3.15?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/nuget/Avalonia.Diagnostics/11.3.14/11.3.15?slim=true) |
| [Avalonia.Markup.Xaml.Loader](https://avaloniaui.net/?utm_source=nuget&utm_medium=referral&utm_content=project_homepage_link) ([source](https://github.com/AvaloniaUI/Avalonia)) | `11.3.14` → `11.3.15` | ![age](https://developer.mend.io/api/mc/badges/age/nuget/Avalonia.Markup.Xaml.Loader/11.3.15?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/nuget/Avalonia.Markup.Xaml.Loader/11.3.14/11.3.15?slim=true) |

---

### Configuration

📅 **Schedule**: (UTC)

- Branch creation
  - At any time (no schedule defined)
- Automerge
  - At any time (no schedule defined)

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Mend Renovate](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My4xNjUuMSIsInVwZGF0ZWRJblZlciI6IjQzLjE2NS4xIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIiwibGFiZWxzIjpbXX0=-->

Reviewed-on: https://git.ryujinx.app/projects/Ryubing/pulls/85

.forgejo/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
     name: ${{ matrix.platform.name }} (${{ matrix.configuration }})
     runs-on: docker
     container:
-      image: ghcr.io/catthehacker/ubuntu:act-latest
+      image: ghcr.io/gruke-build/ubuntu:dotnet-latest
     timeout-minutes: 45
     strategy:
       matrix:
@@ -37,19 +37,6 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - uses: actions/setup-dotnet@v5
-        with:
-          global-json-file: global.json
-
-      - name: Install GLI
-        uses: actions/setup-gli@v1
-        with:
-          token: ${{ secrets.SETUP_GLI_TOKEN }}
-
-      - name: Install 7zip
-        run: |
-          sudo apt update && sudo apt install -y 7zip
-
       - name: Overwrite csc problem matcher
         run: echo "::add-matcher::.forgejo/csc.json"
 
@@ -107,14 +94,6 @@ jobs:
 
           PLATFORM_NAME="${{ matrix.platform.name }}"
 
-          sudo apt update && sudo apt install -y zsync desktop-file-utils appstream libfuse2t64
-
-          mkdir -p tools
-          export PATH="$PATH:$(readlink -f tools)"
-
-          # Setup appimagetool
-          wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
-          chmod +x tools/appimagetool
           chmod +x distribution/linux/appimage/build-appimage.sh
 
           # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
@@ -141,7 +120,9 @@ jobs:
 
   build_macos:
     name: macOS Universal (${{ matrix.configuration }})
-    runs-on: ubuntu-latest
+    runs-on: docker
+    container:
+      image: ghcr.io/gruke-build/ubuntu:dotnet-latest
     timeout-minutes: 45
     strategy:
       matrix:
@@ -150,21 +131,12 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - uses: actions/setup-dotnet@v5
-        with:
-          global-json-file: global.json
-
       - name: Setup LLVM 17
         run: |
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
           sudo ./llvm.sh 17
 
-      - name: Install GLI
-        uses: actions/setup-gli@v1
-        with:
-          token: ${{ secrets.SETUP_GLI_TOKEN }}
-
       - name: Install rcodesign
         run: |
           gli ghr -R indygreg/apple-platform-rs -p apple-codesign-*-x86_64-unknown-linux-musl.tar.gz -O apple-codesign.tar.gz

.forgejo/workflows/canary.yml

@@ -31,29 +31,16 @@ jobs:
     strategy:
       matrix:
         platform:
-          - { name: win-x64,     os: ghcr.io/catthehacker/ubuntu:act-latest, zip_os_name: win_x64     }
+          - { name: win-x64,     os: ghcr.io/gruke-build/ubuntu:dotnet-latest, zip_os_name: win_x64      }
-          #- { name: win-arm64,   os: ghcr.io/catthehacker/ubuntu:act-latest, zip_os_name: win_arm64   }
+          #- { name: win-arm64,   os: ghcr.io/gruke-build/ubuntu:dotnet-latest, zip_os_name: win_arm64    }
-          - { name: linux-x64,   os: ghcr.io/catthehacker/ubuntu:act-latest,  zip_os_name: linux_x64   }
+          - { name: linux-x64,   os: ghcr.io/gruke-build/ubuntu:dotnet-latest,  zip_os_name: linux_x64   }
-          - { name: linux-arm64, os: ghcr.io/catthehacker/ubuntu:act-latest,  zip_os_name: linux_arm64 }
+          - { name: linux-arm64, os: ghcr.io/gruke-build/ubuntu:dotnet-latest,  zip_os_name: linux_arm64 }
     steps:
       - uses: actions/checkout@v6
 
-      - uses: actions/setup-dotnet@v5
-        with:
-          global-json-file: global.json
-
       - name: Overwrite csc problem matcher
         run: echo "::add-matcher::.forgejo/csc.json"
 
-      - name: Install GLI
-        uses: actions/setup-gli@v1
-        with:
-          token: ${{ secrets.SETUP_GLI_TOKEN }}
-
-      - name: Install 7zip
-        run: |
-          sudo apt update && sudo apt install -y 7zip
-
       - name: Get version info
         id: version_info
         run: |
@@ -105,14 +92,6 @@ jobs:
           BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
           PLATFORM_NAME="${{ matrix.platform.name }}"
 
-          sudo apt update && sudo apt install -y zsync desktop-file-utils appstream libfuse2t64
-
-          mkdir -p tools
-          export PATH="$PATH:$(readlink -f tools)"
-
-          # Setup appimagetool
-          wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
-          chmod +x tools/appimagetool
           chmod +x distribution/linux/appimage/build-appimage.sh
 
           # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
@@ -149,25 +128,16 @@ jobs:
     name: Release MacOS universal
     runs-on: docker
     container:
-      image: ghcr.io/catthehacker/ubuntu:act-latest
+      image: ghcr.io/gruke-build/ubuntu:dotnet-latest
     steps:
       - uses: actions/checkout@v6
 
-      - uses: actions/setup-dotnet@v5
-        with:
-          global-json-file: global.json
-
       - name: Setup LLVM 17
         run: |
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
           sudo ./llvm.sh 17
 
-      - name: Install GLI
-        uses: actions/setup-gli@v1
-        with:
-          token: ${{ secrets.SETUP_GLI_TOKEN }}
-
       - name: Install rcodesign
         run: |
           gli ghr -R indygreg/apple-platform-rs -p apple-codesign-*-x86_64-unknown-linux-musl.tar.gz -O apple-codesign.tar.gz
@@ -212,18 +182,11 @@ jobs:
     name: Post CI Steps
     runs-on: docker
     container:
-      image: ghcr.io/catthehacker/ubuntu:act-latest
+      image: ghcr.io/gruke-build/ubuntu:act-latest
     needs: 
       - macos_release
       - release
     steps:
-      - uses: actions/checkout@v6
-        
-      - name: Install GLI
-        uses: actions/setup-gli@v1
-        with:
-          token: ${{ secrets.SETUP_GLI_TOKEN }}
-      
       - name: Get version info
         id: version_info
         run: |

.forgejo/workflows/release.yml

@@ -25,29 +25,16 @@ jobs:
     strategy:
       matrix:
         platform:
-          - { name: win-x64,     os: ghcr.io/catthehacker/ubuntu:act-latest, zip_os_name: win_x64     }
+          - { name: win-x64,     os: ghcr.io/gruke-build/ubuntu:act-latest, zip_os_name: win_x64      }
-          #- { name: win-arm64,   os: ghcr.io/catthehacker/ubuntu:act-latest, zip_os_name: win_arm64   }
+          #- { name: win-arm64,   os: ghcr.io/gruke-build/ubuntu:act-latest, zip_os_name: win_arm64    }
-          - { name: linux-x64,   os: ghcr.io/catthehacker/ubuntu:act-latest,  zip_os_name: linux_x64   }
+          - { name: linux-x64,   os: ghcr.io/gruke-build/ubuntu:act-latest,  zip_os_name: linux_x64   }
-          - { name: linux-arm64, os: ghcr.io/catthehacker/ubuntu:act-latest,  zip_os_name: linux_arm64 }
+          - { name: linux-arm64, os: ghcr.io/gruke-build/ubuntu:act-latest,  zip_os_name: linux_arm64 }
     steps:
       - uses: actions/checkout@v6
 
-      - uses: actions/setup-dotnet@v5
-        with:
-          global-json-file: global.json
-
       - name: Overwrite csc problem matcher
         run: echo "::add-matcher::.github/csc.json"
 
-      - name: Install 7zip
-        run: |
-          sudo apt install -y 7zip
-          
-      - name: Install GLI
-        uses: actions/setup-gli@v1
-        with:
-          token: ${{ secrets.SETUP_GLI_TOKEN }}
-
       - name: Get version info
         id: version_info
         run: |
@@ -102,14 +89,6 @@ jobs:
           BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
           PLATFORM_NAME="${{ matrix.platform.name }}"
 
-          sudo apt install -y zsync desktop-file-utils appstream
-
-          mkdir -p tools
-          export PATH="$PATH:$(readlink -f tools)"
-
-          # Setup appimagetool
-          wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
-          chmod +x tools/appimagetool
           chmod +x distribution/linux/appimage/build-appimage.sh
 
           # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
@@ -143,7 +122,9 @@ jobs:
 
   macos_release:
     name: Release MacOS universal
-    runs-on: ubuntu-latest
+    runs-on: docker
+    container:
+      image: ghcr.io/gruke-build/ubuntu:dotnet-latest
     steps:
       - uses: actions/checkout@v6
 
@@ -157,11 +138,6 @@ jobs:
           chmod +x llvm.sh
           sudo ./llvm.sh 17
 
-      - name: Install GLI
-        uses: actions/setup-gli@v1
-        with:
-          token: ${{ secrets.SETUP_GLI_TOKEN }}
-
       - name: Install rcodesign
         run: |
           gli ghr -R indygreg/apple-platform-rs -p apple-codesign-*-x86_64-unknown-linux-musl.tar.gz -O apple-codesign.tar.gz
@@ -205,18 +181,13 @@ jobs:
 
   post_ci:
     name: Post-CI Steps
-    runs-on: ubuntu-latest
+    runs-on: docker
+    container:
+      image: ghcr.io/gruke-build/ubuntu:act-latest
     needs:
       - macos_release
       - release
     steps:
-      - uses: actions/checkout@v6
-        
-      - name: Install GLI
-        uses: actions/setup-gli@v1
-        with:
-          token: ${{ secrets.SETUP_GLI_TOKEN }}
-
       - name: Get version info
         id: version_info
         run: |

Directory.Packages.props

@@ -3,11 +3,11 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia" Version="11.3.14" />
+    <PackageVersion Include="Avalonia" Version="11.3.15" />
     <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.13" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.3.14" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.15" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.14" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.15" />
-    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.14" />
+    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.15" />
     <PackageVersion Include="SharpCompress" Version="0.48.0" />
     <PackageVersion Include="Svg.Controls.Avalonia" Version="11.3.9.5" />
     <PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="11.3.9.5" />

src/Ryujinx.Graphics.Vulkan/Auto.cs

@@ -177,8 +177,6 @@ namespace Ryujinx.Graphics.Vulkan
                 }
             }
             
-            // This can somehow become -1.
-            // Logger.Info?.PrintMsg(LogClass.Gpu, $"_referenceCount: {_referenceCount}");
             Debug.Assert(_referenceCount >= 0);
         }
 

src/Ryujinx/Systems/AppHost.cs

@@ -622,15 +622,15 @@ namespace Ryujinx.Ava.Systems
             // If the GPU has no work and is cancelled, we need to handle that as well.
 
             WaitHandle.WaitAny(new[] { _gpuDoneEvent, _gpuCancellationTokenSource.Token.WaitHandle });
-            _gpuCancellationTokenSource.Dispose();
 
-            // Waiting for work to be finished before we dispose.
             if (_renderingStarted)
             {
+                // Waiting for work to be finished before we dispose.
                 Device.Gpu.WaitUntilGpuReady();
             }
             
             _gpuDoneEvent.Dispose();
+            _gpuCancellationTokenSource.Dispose();
             
             DisposeGpu();
             AppExit?.Invoke(this, EventArgs.Empty);
@@ -1095,51 +1095,56 @@ namespace Ryujinx.Ava.Systems
 
             Device.Gpu.Renderer.RunLoop(() =>
             {
-                Device.Gpu.SetGpuThread();
+                try
-                Device.Gpu.InitializeShaderCache(_gpuCancellationTokenSource.Token);
-
-                _renderer.Window.ChangeVSyncMode(Device.VSyncMode);
-
-                while (_isActive)
                 {
-                    _ticks += _chrono.ElapsedTicks;
+                    Device.Gpu.SetGpuThread();
+                    Device.Gpu.InitializeShaderCache(_gpuCancellationTokenSource.Token);
 
-                    _chrono.Restart();
+                    _renderer.Window.ChangeVSyncMode(Device.VSyncMode);
 
-                    if (Device.WaitFifo())
+                    while (_isActive)
                     {
-                        Device.Statistics.RecordFifoStart();
+                        _ticks += _chrono.ElapsedTicks;
-                        Device.ProcessFrame();
-                        Device.Statistics.RecordFifoEnd();
-                    }
 
-                    while (Device.ConsumeFrameAvailable())
+                        _chrono.Restart();
-                    {
+
-                        if (!_renderingStarted)
+                        if (Device.WaitFifo())
                         {
-                            _renderingStarted = true;
+                            Device.Statistics.RecordFifoStart();
-                            _viewModel.SwitchToRenderer(false);
+                            Device.ProcessFrame();
-                            InitStatus();
+                            Device.Statistics.RecordFifoEnd();
                         }
 
-                        Device.PresentFrame(() => (RendererHost.EmbeddedWindow as EmbeddedWindowOpenGL)?.SwapBuffers());
+                        while (Device.ConsumeFrameAvailable())
-                    }
+                        {
+                            if (!_renderingStarted)
+                            {
+                                _renderingStarted = true;
+                                _viewModel.SwitchToRenderer(false);
+                                InitStatus();
+                            }
 
-                    if (_ticks >= _ticksPerFrame)
+                            Device.PresentFrame(() =>
-                    {
+                                (RendererHost.EmbeddedWindow as EmbeddedWindowOpenGL)?.SwapBuffers());
-                        UpdateStatus();
+                        }
+
+                        if (_ticks >= _ticksPerFrame)
+                        {
+                            UpdateStatus();
+                        }
                     }
                 }
-
+                finally
-                // Make sure all commands in the run loop are fully executed before leaving the loop.
-                if (Device.Gpu.Renderer is ThreadedRenderer threaded)
                 {
-                    Logger.Info?.PrintMsg(LogClass.Gpu, "Flushing threaded commands...");
+                    // Make sure all commands in the run loop are fully executed before leaving the loop.
-                    threaded.FlushThreadedCommands();
+                    if (Device.Gpu.Renderer is ThreadedRenderer threaded)
-                    Logger.Info?.PrintMsg(LogClass.Gpu, "Flushed!");
+                    {
+                        Logger.Info?.PrintMsg(LogClass.Gpu, "Flushing threaded commands...");
+                        threaded.FlushThreadedCommands();
+                        Logger.Info?.PrintMsg(LogClass.Gpu, "Flushed!");
+                    }
+                    _gpuDoneEvent.Set();
                 }
-
-                _gpuDoneEvent.Set();
             });
 
             (RendererHost.EmbeddedWindow as EmbeddedWindowOpenGL)?.MakeCurrent(true);