Merge 9003549de1 into 5dbba07e33

Ryujinx was not hinting application name, so on some platforms (e.g.
Linux) volume control shows Ryujinx as 'SDL Application'. This can cause
confusion.

This commit fixes name in volume control applets on some platforms.

see: https://wiki.libsdl.org/SDL2/SDL_HINT_APP_NAME

Directory.Packages.props

@@ -37,8 +37,8 @@
     <PackageVersion Include="Ryujinx.GtkSharp" Version="3.24.24.59-ryujinx" />
     <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
-    <PackageVersion Include="shaderc.net" Version="0.1.0" />
     <PackageVersion Include="SharpZipLib" Version="1.4.2" />
+    <PackageVersion Include="Silk.NET.Shaderc" Version="2.21.0" />
     <PackageVersion Include="Silk.NET.Vulkan" Version="2.21.0" />
     <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.21.0" />
     <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.21.0" />

src/Ryujinx.Graphics.Vulkan/Ryujinx.Graphics.Vulkan.csproj

@@ -52,7 +52,7 @@
 
   <ItemGroup>
     <PackageReference Include="OpenTK.Windowing.GraphicsLibraryFramework" />
-    <PackageReference Include="shaderc.net" />
+    <PackageReference Include="Silk.NET.Shaderc" />
     <PackageReference Include="Silk.NET.Vulkan" />
     <PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" />
     <PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" />

src/Ryujinx.Graphics.Vulkan/Shader.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Shader;
-using shaderc;
+using Silk.NET.Shaderc;
 using Silk.NET.Vulkan;
 using System;
 using System.Runtime.InteropServices;
@@ -11,10 +11,6 @@ namespace Ryujinx.Graphics.Vulkan
 {
     class Shader : IDisposable
     {
-        // The shaderc.net dependency's Options constructor and dispose are not thread safe.
-        // Take this lock when using them.
-        private static readonly object _shaderOptionsLock = new();
-
         private static readonly IntPtr _ptrMainEntryPointName = Marshal.StringToHGlobalAnsi("main");
 
         private readonly Vk _api;
@@ -73,38 +69,33 @@ namespace Ryujinx.Graphics.Vulkan
 
         private unsafe static byte[] GlslToSpirv(string glsl, ShaderStage stage)
         {
-            Options options;
+            var api = Shaderc.GetApi();
+            var compiler = api.CompilerInitialize();
+            var options = api.CompileOptionsInitialize();
 
-            lock (_shaderOptionsLock)
+            api.CompileOptionsSetSourceLanguage(options, SourceLanguage.Glsl);
+            api.CompileOptionsSetTargetSpirv(options, SpirvVersion.Shaderc15);
+            api.CompileOptionsSetTargetEnv(options, TargetEnv.Vulkan, Vk.Version12);
+
+            var scr = api.CompileIntoSpv(compiler, glsl, (nuint)glsl.Length, GetShaderCShaderStage(stage), "Ryu", "main", options);
+
+            var status = api.ResultGetCompilationStatus(scr);
+
+            if (status != CompilationStatus.Success)
             {
-                options = new Options(false)
+                Logger.Error?.Print(LogClass.Gpu, $"Shader compilation error: {status} {api.ResultGetErrorMessageS(scr)}");
-                {
-                    SourceLanguage = SourceLanguage.Glsl,
-                    TargetSpirVVersion = new SpirVVersion(1, 5),
-                };
-            }
-
-            options.SetTargetEnvironment(TargetEnvironment.Vulkan, EnvironmentVersion.Vulkan_1_2);
-            Compiler compiler = new(options);
-            var scr = compiler.Compile(glsl, "Ryu", GetShaderCShaderStage(stage));
-
-            lock (_shaderOptionsLock)
-            {
-                options.Dispose();
-            }
-
-            if (scr.Status != Status.Success)
-            {
-                Logger.Error?.Print(LogClass.Gpu, $"Shader compilation error: {scr.Status} {scr.ErrorMessage}");
 
                 return null;
             }
 
-            var spirvBytes = new Span<byte>((void*)scr.CodePointer, (int)scr.CodeLength);
+            var spirvBytes = new Span<byte>(api.ResultGetBytes(scr), (int)api.ResultGetLength(scr));
 
-            byte[] code = new byte[(scr.CodeLength + 3) & ~3];
+            byte[] code = new byte[(spirvBytes.Length + 3) & ~3];
 
-            spirvBytes.CopyTo(code.AsSpan()[..(int)scr.CodeLength]);
+            spirvBytes.CopyTo(code.AsSpan()[..spirvBytes.Length]);
+
+            api.CompilerRelease(compiler);
+            api.CompileOptionsRelease(options);
 
             return code;
         }

src/Ryujinx.SDL2.Common/SDL2Driver.cs

@@ -53,6 +53,7 @@ namespace Ryujinx.SDL2.Common
                     return;
                 }
 
+                SDL_SetHint(SDL_HINT_APP_NAME, "Ryujinx");
                 SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE, "1");
                 SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE, "1");
                 SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1");