mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-12-23 06:41:22 -08:00
Replace shaderc.net with Silk.NET.Shaderc
This commit is contained in:
parent
398fa1c238
commit
9003549de1
@ -37,8 +37,8 @@
|
|||||||
<PackageVersion Include="Ryujinx.GtkSharp" Version="3.24.24.59-ryujinx" />
|
<PackageVersion Include="Ryujinx.GtkSharp" Version="3.24.24.59-ryujinx" />
|
||||||
<PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
|
<PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
|
||||||
<PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
|
<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="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" Version="2.21.0" />
|
||||||
<PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" 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" />
|
<PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.21.0" />
|
||||||
|
@ -51,7 +51,7 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="OpenTK.Windowing.GraphicsLibraryFramework" />
|
<PackageReference Include="OpenTK.Windowing.GraphicsLibraryFramework" />
|
||||||
<PackageReference Include="shaderc.net" />
|
<PackageReference Include="Silk.NET.Shaderc" />
|
||||||
<PackageReference Include="Silk.NET.Vulkan" />
|
<PackageReference Include="Silk.NET.Vulkan" />
|
||||||
<PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" />
|
<PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" />
|
||||||
<PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" />
|
<PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" />
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
using Ryujinx.Common.Logging;
|
using Ryujinx.Common.Logging;
|
||||||
using Ryujinx.Graphics.GAL;
|
using Ryujinx.Graphics.GAL;
|
||||||
using Ryujinx.Graphics.Shader;
|
using Ryujinx.Graphics.Shader;
|
||||||
using shaderc;
|
using Silk.NET.Shaderc;
|
||||||
using Silk.NET.Vulkan;
|
using Silk.NET.Vulkan;
|
||||||
using System;
|
using System;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
@ -11,10 +11,6 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
{
|
{
|
||||||
class Shader : IDisposable
|
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 static readonly IntPtr _ptrMainEntryPointName = Marshal.StringToHGlobalAnsi("main");
|
||||||
|
|
||||||
private readonly Vk _api;
|
private readonly Vk _api;
|
||||||
@ -73,38 +69,33 @@ namespace Ryujinx.Graphics.Vulkan
|
|||||||
|
|
||||||
private unsafe static byte[] GlslToSpirv(string glsl, ShaderStage stage)
|
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);
|
||||||
options = new Options(false)
|
api.CompileOptionsSetTargetEnv(options, TargetEnv.Vulkan, Vk.Version12);
|
||||||
{
|
|
||||||
SourceLanguage = SourceLanguage.Glsl,
|
|
||||||
TargetSpirVVersion = new SpirVVersion(1, 5),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
options.SetTargetEnvironment(TargetEnvironment.Vulkan, EnvironmentVersion.Vulkan_1_2);
|
var scr = api.CompileIntoSpv(compiler, glsl, (nuint)glsl.Length, GetShaderCShaderStage(stage), "Ryu", "main", options);
|
||||||
Compiler compiler = new(options);
|
|
||||||
var scr = compiler.Compile(glsl, "Ryu", GetShaderCShaderStage(stage));
|
|
||||||
|
|
||||||
lock (_shaderOptionsLock)
|
var status = api.ResultGetCompilationStatus(scr);
|
||||||
{
|
|
||||||
options.Dispose();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (scr.Status != Status.Success)
|
if (status != CompilationStatus.Success)
|
||||||
{
|
{
|
||||||
Logger.Error?.Print(LogClass.Gpu, $"Shader compilation error: {scr.Status} {scr.ErrorMessage}");
|
Logger.Error?.Print(LogClass.Gpu, $"Shader compilation error: {status} {api.ResultGetErrorMessageS(scr)}");
|
||||||
|
|
||||||
return null;
|
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;
|
return code;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user