Merge pull request #2177 from riperiperi/feature/parallel-shader-cache
Allow parallel shader compilation when loading a shader cache
This commit is contained in:
commit
b5c72b44de
16 changed files with 785 additions and 251 deletions
22
Ryujinx.Common/GraphicsDriver/DriverUtilities.cs
Normal file
22
Ryujinx.Common/GraphicsDriver/DriverUtilities.cs
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
using System;
|
||||||
|
|
||||||
|
namespace Ryujinx.Common.GraphicsDriver
|
||||||
|
{
|
||||||
|
public static class DriverUtilities
|
||||||
|
{
|
||||||
|
public static void ToggleOGLThreading(bool enabled)
|
||||||
|
{
|
||||||
|
Environment.SetEnvironmentVariable("mesa_glthread", enabled.ToString());
|
||||||
|
Environment.SetEnvironmentVariable("__GL_THREADED_OPTIMIZATIONS", enabled ? "1" : "0");
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
NVThreadedOptimization.SetThreadedOptimization(enabled);
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
// NVAPI is not available, or couldn't change the application profile.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
11
Ryujinx.Common/GraphicsDriver/NVAPI/Nvapi.cs
Normal file
11
Ryujinx.Common/GraphicsDriver/NVAPI/Nvapi.cs
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
namespace Ryujinx.Common.GraphicsDriver.NVAPI
|
||||||
|
{
|
||||||
|
enum Nvapi : uint
|
||||||
|
{
|
||||||
|
OglThreadControlId = 0x20C1221E,
|
||||||
|
|
||||||
|
OglThreadControlDefault = 0,
|
||||||
|
OglThreadControlEnable = 1,
|
||||||
|
OglThreadControlDisable = 2
|
||||||
|
}
|
||||||
|
}
|
42
Ryujinx.Common/GraphicsDriver/NVAPI/NvapiUnicodeString.cs
Normal file
42
Ryujinx.Common/GraphicsDriver/NVAPI/NvapiUnicodeString.cs
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
|
namespace Ryujinx.Common.GraphicsDriver.NVAPI
|
||||||
|
{
|
||||||
|
[StructLayout(LayoutKind.Sequential, Pack = 4)]
|
||||||
|
public unsafe struct NvapiUnicodeString
|
||||||
|
{
|
||||||
|
private fixed byte _data[4096];
|
||||||
|
|
||||||
|
public NvapiUnicodeString(string text)
|
||||||
|
{
|
||||||
|
Set(text);
|
||||||
|
}
|
||||||
|
|
||||||
|
public string Get()
|
||||||
|
{
|
||||||
|
fixed (byte* data = _data)
|
||||||
|
{
|
||||||
|
string text = Encoding.Unicode.GetString(data, 4096);
|
||||||
|
|
||||||
|
int index = text.IndexOf('\0');
|
||||||
|
if (index > -1)
|
||||||
|
{
|
||||||
|
text = text.Remove(index);
|
||||||
|
}
|
||||||
|
|
||||||
|
return text;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Set(string text)
|
||||||
|
{
|
||||||
|
text += '\0';
|
||||||
|
fixed (char* textPtr = text)
|
||||||
|
fixed (byte* data = _data)
|
||||||
|
{
|
||||||
|
int written = Encoding.Unicode.GetBytes(textPtr, text.Length, data, 4096);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
17
Ryujinx.Common/GraphicsDriver/NVAPI/NvdrsApplicationV4.cs
Normal file
17
Ryujinx.Common/GraphicsDriver/NVAPI/NvdrsApplicationV4.cs
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
namespace Ryujinx.Common.GraphicsDriver.NVAPI
|
||||||
|
{
|
||||||
|
[StructLayout(LayoutKind.Sequential, Pack = 4)]
|
||||||
|
unsafe struct NvdrsApplicationV4
|
||||||
|
{
|
||||||
|
public uint Version;
|
||||||
|
public uint IsPredefined;
|
||||||
|
public NvapiUnicodeString AppName;
|
||||||
|
public NvapiUnicodeString UserFriendlyName;
|
||||||
|
public NvapiUnicodeString Launcher;
|
||||||
|
public NvapiUnicodeString FileInFolder;
|
||||||
|
public uint Flags;
|
||||||
|
public NvapiUnicodeString CommandLine;
|
||||||
|
}
|
||||||
|
}
|
16
Ryujinx.Common/GraphicsDriver/NVAPI/NvdrsProfile.cs
Normal file
16
Ryujinx.Common/GraphicsDriver/NVAPI/NvdrsProfile.cs
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
using System;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
namespace Ryujinx.Common.GraphicsDriver.NVAPI
|
||||||
|
{
|
||||||
|
[StructLayout(LayoutKind.Sequential, Pack = 1)]
|
||||||
|
unsafe struct NvdrsProfile
|
||||||
|
{
|
||||||
|
public uint Version;
|
||||||
|
public NvapiUnicodeString ProfileName;
|
||||||
|
public uint GpuSupport;
|
||||||
|
public uint IsPredefined;
|
||||||
|
public uint NumOfApps;
|
||||||
|
public uint NumOfSettings;
|
||||||
|
}
|
||||||
|
}
|
49
Ryujinx.Common/GraphicsDriver/NVAPI/NvdrsSetting.cs
Normal file
49
Ryujinx.Common/GraphicsDriver/NVAPI/NvdrsSetting.cs
Normal file
|
@ -0,0 +1,49 @@
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
namespace Ryujinx.Common.GraphicsDriver.NVAPI
|
||||||
|
{
|
||||||
|
enum NvdrsSettingType : uint
|
||||||
|
{
|
||||||
|
NvdrsDwordType,
|
||||||
|
NvdrsBinaryType,
|
||||||
|
NvdrsStringType,
|
||||||
|
NvdrsWstringType,
|
||||||
|
}
|
||||||
|
|
||||||
|
enum NvdrsSettingLocation : uint
|
||||||
|
{
|
||||||
|
NvdrsCurrentProfileLocation,
|
||||||
|
NvdrsGlobalProfileLocation,
|
||||||
|
NvdrsBaseProfileLocation,
|
||||||
|
NvdrsDefaultProfileLocation,
|
||||||
|
}
|
||||||
|
|
||||||
|
[StructLayout(LayoutKind.Explicit, Size = 0x3020)]
|
||||||
|
unsafe struct NvdrsSetting
|
||||||
|
{
|
||||||
|
[FieldOffset(0x0)]
|
||||||
|
public uint Version;
|
||||||
|
[FieldOffset(0x4)]
|
||||||
|
public NvapiUnicodeString SettingName;
|
||||||
|
[FieldOffset(0x1004)]
|
||||||
|
public Nvapi SettingId;
|
||||||
|
[FieldOffset(0x1008)]
|
||||||
|
public NvdrsSettingType SettingType;
|
||||||
|
[FieldOffset(0x100C)]
|
||||||
|
public NvdrsSettingLocation SettingLocation;
|
||||||
|
[FieldOffset(0x1010)]
|
||||||
|
public uint IsCurrentPredefined;
|
||||||
|
[FieldOffset(0x1014)]
|
||||||
|
public uint IsPredefinedValid;
|
||||||
|
|
||||||
|
[FieldOffset(0x1018)]
|
||||||
|
public uint PredefinedValue;
|
||||||
|
[FieldOffset(0x1018)]
|
||||||
|
public NvapiUnicodeString PredefinedString;
|
||||||
|
|
||||||
|
[FieldOffset(0x201C)]
|
||||||
|
public uint CurrentValue;
|
||||||
|
[FieldOffset(0x201C)]
|
||||||
|
public NvapiUnicodeString CurrentString;
|
||||||
|
}
|
||||||
|
}
|
163
Ryujinx.Common/GraphicsDriver/NVThreadedOptimization.cs
Normal file
163
Ryujinx.Common/GraphicsDriver/NVThreadedOptimization.cs
Normal file
|
@ -0,0 +1,163 @@
|
||||||
|
using Ryujinx.Common.GraphicsDriver.NVAPI;
|
||||||
|
using System;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
namespace Ryujinx.Common.GraphicsDriver
|
||||||
|
{
|
||||||
|
static class NVThreadedOptimization
|
||||||
|
{
|
||||||
|
private const string ProfileName = "Ryujinx Nvidia Profile";
|
||||||
|
|
||||||
|
private const uint NvAPI_Initialize_ID = 0x0150E828;
|
||||||
|
private const uint NvAPI_DRS_CreateSession_ID = 0x0694D52E;
|
||||||
|
private const uint NvAPI_DRS_LoadSettings_ID = 0x375DBD6B;
|
||||||
|
private const uint NvAPI_DRS_FindProfileByName_ID = 0x7E4A9A0B;
|
||||||
|
private const uint NvAPI_DRS_CreateProfile_ID = 0x0CC176068;
|
||||||
|
private const uint NvAPI_DRS_CreateApplication_ID = 0x4347A9DE;
|
||||||
|
private const uint NvAPI_DRS_SetSetting_ID = 0x577DD202;
|
||||||
|
private const uint NvAPI_DRS_SaveSettings_ID = 0xFCBC7E14;
|
||||||
|
private const uint NvAPI_DRS_DestroySession_ID = 0x0DAD9CFF8;
|
||||||
|
|
||||||
|
[DllImport("nvapi64")]
|
||||||
|
private static extern IntPtr nvapi_QueryInterface(uint id);
|
||||||
|
|
||||||
|
private delegate int NvAPI_InitializeDelegate();
|
||||||
|
private static NvAPI_InitializeDelegate NvAPI_Initialize;
|
||||||
|
|
||||||
|
private delegate int NvAPI_DRS_CreateSessionDelegate(out IntPtr handle);
|
||||||
|
private static NvAPI_DRS_CreateSessionDelegate NvAPI_DRS_CreateSession;
|
||||||
|
|
||||||
|
private delegate int NvAPI_DRS_LoadSettingsDelegate(IntPtr handle);
|
||||||
|
private static NvAPI_DRS_LoadSettingsDelegate NvAPI_DRS_LoadSettings;
|
||||||
|
|
||||||
|
private delegate int NvAPI_DRS_FindProfileByNameDelegate(IntPtr handle, NvapiUnicodeString profileName, out IntPtr profileHandle);
|
||||||
|
private static NvAPI_DRS_FindProfileByNameDelegate NvAPI_DRS_FindProfileByName;
|
||||||
|
|
||||||
|
private delegate int NvAPI_DRS_CreateProfileDelegate(IntPtr handle, ref NvdrsProfile profileInfo, out IntPtr profileHandle);
|
||||||
|
private static NvAPI_DRS_CreateProfileDelegate NvAPI_DRS_CreateProfile;
|
||||||
|
|
||||||
|
private delegate int NvAPI_DRS_CreateApplicationDelegate(IntPtr handle, IntPtr profileHandle, ref NvdrsApplicationV4 app);
|
||||||
|
private static NvAPI_DRS_CreateApplicationDelegate NvAPI_DRS_CreateApplication;
|
||||||
|
|
||||||
|
private delegate int NvAPI_DRS_SetSettingDelegate(IntPtr handle, IntPtr profileHandle, ref NvdrsSetting setting);
|
||||||
|
private static NvAPI_DRS_SetSettingDelegate NvAPI_DRS_SetSetting;
|
||||||
|
|
||||||
|
private delegate int NvAPI_DRS_SaveSettingsDelegate(IntPtr handle);
|
||||||
|
private static NvAPI_DRS_SaveSettingsDelegate NvAPI_DRS_SaveSettings;
|
||||||
|
|
||||||
|
private delegate int NvAPI_DRS_DestroySessionDelegate(IntPtr handle);
|
||||||
|
private static NvAPI_DRS_DestroySessionDelegate NvAPI_DRS_DestroySession;
|
||||||
|
|
||||||
|
private static bool _initialized;
|
||||||
|
|
||||||
|
private static void Check(int status)
|
||||||
|
{
|
||||||
|
if (status != 0)
|
||||||
|
{
|
||||||
|
throw new Exception($"NVAPI Error: {status}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void Initialize()
|
||||||
|
{
|
||||||
|
if (!_initialized)
|
||||||
|
{
|
||||||
|
NvAPI_Initialize = NvAPI_Delegate<NvAPI_InitializeDelegate>(NvAPI_Initialize_ID);
|
||||||
|
|
||||||
|
Check(NvAPI_Initialize());
|
||||||
|
|
||||||
|
NvAPI_DRS_CreateSession = NvAPI_Delegate<NvAPI_DRS_CreateSessionDelegate>(NvAPI_DRS_CreateSession_ID);
|
||||||
|
NvAPI_DRS_LoadSettings = NvAPI_Delegate<NvAPI_DRS_LoadSettingsDelegate>(NvAPI_DRS_LoadSettings_ID);
|
||||||
|
NvAPI_DRS_FindProfileByName = NvAPI_Delegate<NvAPI_DRS_FindProfileByNameDelegate>(NvAPI_DRS_FindProfileByName_ID);
|
||||||
|
NvAPI_DRS_CreateProfile = NvAPI_Delegate<NvAPI_DRS_CreateProfileDelegate>(NvAPI_DRS_CreateProfile_ID);
|
||||||
|
NvAPI_DRS_CreateApplication = NvAPI_Delegate<NvAPI_DRS_CreateApplicationDelegate>(NvAPI_DRS_CreateApplication_ID);
|
||||||
|
NvAPI_DRS_SetSetting = NvAPI_Delegate<NvAPI_DRS_SetSettingDelegate>(NvAPI_DRS_SetSetting_ID);
|
||||||
|
NvAPI_DRS_SaveSettings = NvAPI_Delegate<NvAPI_DRS_SaveSettingsDelegate>(NvAPI_DRS_SaveSettings_ID);
|
||||||
|
NvAPI_DRS_DestroySession = NvAPI_Delegate<NvAPI_DRS_DestroySessionDelegate>(NvAPI_DRS_DestroySession_ID);
|
||||||
|
|
||||||
|
_initialized = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static uint MakeVersion<T>(uint version) where T : unmanaged
|
||||||
|
{
|
||||||
|
return (uint)Unsafe.SizeOf<T>() | version << 16;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void SetThreadedOptimization(bool enabled)
|
||||||
|
{
|
||||||
|
Initialize();
|
||||||
|
|
||||||
|
uint targetValue = (uint)(enabled ? Nvapi.OglThreadControlEnable : Nvapi.OglThreadControlDisable);
|
||||||
|
|
||||||
|
Check(NvAPI_Initialize());
|
||||||
|
|
||||||
|
Check(NvAPI_DRS_CreateSession(out IntPtr handle));
|
||||||
|
|
||||||
|
Check(NvAPI_DRS_LoadSettings(handle));
|
||||||
|
|
||||||
|
IntPtr profileHandle;
|
||||||
|
|
||||||
|
// Check if the profile already exists.
|
||||||
|
|
||||||
|
int status = NvAPI_DRS_FindProfileByName(handle, new NvapiUnicodeString(ProfileName), out profileHandle);
|
||||||
|
|
||||||
|
if (status != 0)
|
||||||
|
{
|
||||||
|
NvdrsProfile profile = new NvdrsProfile {
|
||||||
|
Version = MakeVersion<NvdrsProfile>(1),
|
||||||
|
IsPredefined = 0,
|
||||||
|
GpuSupport = uint.MaxValue
|
||||||
|
};
|
||||||
|
profile.ProfileName.Set(ProfileName);
|
||||||
|
Check(NvAPI_DRS_CreateProfile(handle, ref profile, out profileHandle));
|
||||||
|
|
||||||
|
NvdrsApplicationV4 application = new NvdrsApplicationV4
|
||||||
|
{
|
||||||
|
Version = MakeVersion<NvdrsApplicationV4>(4),
|
||||||
|
IsPredefined = 0,
|
||||||
|
Flags = 3 // IsMetro, IsCommandLine
|
||||||
|
};
|
||||||
|
application.AppName.Set("Ryujinx.exe");
|
||||||
|
application.UserFriendlyName.Set("Ryujinx");
|
||||||
|
application.Launcher.Set("");
|
||||||
|
application.FileInFolder.Set("");
|
||||||
|
|
||||||
|
Check(NvAPI_DRS_CreateApplication(handle, profileHandle, ref application));
|
||||||
|
}
|
||||||
|
|
||||||
|
NvdrsSetting setting = new NvdrsSetting
|
||||||
|
{
|
||||||
|
Version = MakeVersion<NvdrsSetting>(1),
|
||||||
|
SettingId = Nvapi.OglThreadControlId,
|
||||||
|
SettingType = NvdrsSettingType.NvdrsDwordType,
|
||||||
|
SettingLocation = NvdrsSettingLocation.NvdrsCurrentProfileLocation,
|
||||||
|
IsCurrentPredefined = 0,
|
||||||
|
IsPredefinedValid = 0,
|
||||||
|
CurrentValue = targetValue,
|
||||||
|
PredefinedValue = targetValue
|
||||||
|
};
|
||||||
|
|
||||||
|
Check(NvAPI_DRS_SetSetting(handle, profileHandle, ref setting));
|
||||||
|
|
||||||
|
Check(NvAPI_DRS_SaveSettings(handle));
|
||||||
|
|
||||||
|
NvAPI_DRS_DestroySession(handle);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static T NvAPI_Delegate<T>(uint id) where T : class
|
||||||
|
{
|
||||||
|
IntPtr ptr = nvapi_QueryInterface(id);
|
||||||
|
|
||||||
|
if (ptr != IntPtr.Zero)
|
||||||
|
{
|
||||||
|
return Marshal.GetDelegateForFunctionPointer(ptr, typeof(T)) as T;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,16 +0,0 @@
|
||||||
using System.Runtime.InteropServices;
|
|
||||||
|
|
||||||
namespace Ryujinx.Common.System
|
|
||||||
{
|
|
||||||
public static class ForceDedicatedGpu
|
|
||||||
{
|
|
||||||
public static void Nvidia()
|
|
||||||
{
|
|
||||||
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
|
|
||||||
{
|
|
||||||
// NOTE: If the DLL exists, we can load it to force the usage of the dedicated Nvidia Gpu.
|
|
||||||
NativeLibrary.TryLoad("nvapi64.dll", out _);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -4,6 +4,8 @@ namespace Ryujinx.Graphics.GAL
|
||||||
{
|
{
|
||||||
public interface IProgram : IDisposable
|
public interface IProgram : IDisposable
|
||||||
{
|
{
|
||||||
|
ProgramLinkStatus CheckProgramLink(bool blocking);
|
||||||
|
|
||||||
byte[] GetBinary();
|
byte[] GetBinary();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
9
Ryujinx.Graphics.GAL/ProgramLinkStatus.cs
Normal file
9
Ryujinx.Graphics.GAL/ProgramLinkStatus.cs
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
namespace Ryujinx.Graphics.GAL
|
||||||
|
{
|
||||||
|
public enum ProgramLinkStatus
|
||||||
|
{
|
||||||
|
Incomplete,
|
||||||
|
Success,
|
||||||
|
Failure
|
||||||
|
}
|
||||||
|
}
|
|
@ -10,6 +10,7 @@ using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace Ryujinx.Graphics.Gpu.Shader
|
namespace Ryujinx.Graphics.Gpu.Shader
|
||||||
{
|
{
|
||||||
|
@ -102,8 +103,23 @@ namespace Ryujinx.Graphics.Gpu.Shader
|
||||||
progressReportThread.Start(progressReportEvent);
|
progressReportThread.Start(progressReportEvent);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int programIndex = 0; programIndex < guestProgramList.Length; programIndex++)
|
// Make sure these are initialized before doing compilation.
|
||||||
|
Capabilities caps = _context.Capabilities;
|
||||||
|
|
||||||
|
int maxTaskCount = Math.Min(Environment.ProcessorCount, 8);
|
||||||
|
int programIndex = 0;
|
||||||
|
List<ShaderCompileTask> activeTasks = new List<ShaderCompileTask>();
|
||||||
|
|
||||||
|
AutoResetEvent taskDoneEvent = new AutoResetEvent(false);
|
||||||
|
|
||||||
|
// This thread dispatches tasks to do shader translation, and creates programs that OpenGL will link in the background.
|
||||||
|
// The program link status is checked in a non-blocking manner so that multiple shaders can be compiled at once.
|
||||||
|
|
||||||
|
while (programIndex < guestProgramList.Length || activeTasks.Count > 0)
|
||||||
{
|
{
|
||||||
|
if (activeTasks.Count < maxTaskCount && programIndex < guestProgramList.Length)
|
||||||
|
{
|
||||||
|
// Begin a new shader compilation.
|
||||||
Hash128 key = guestProgramList[programIndex];
|
Hash128 key = guestProgramList[programIndex];
|
||||||
|
|
||||||
byte[] hostProgramBinary = _cacheManager.GetHostProgramByHash(ref key);
|
byte[] hostProgramBinary = _cacheManager.GetHostProgramByHash(ref key);
|
||||||
|
@ -121,6 +137,8 @@ namespace Ryujinx.Graphics.Gpu.Shader
|
||||||
// Should not happen, but if someone messed with the cache it's better to catch it.
|
// Should not happen, but if someone messed with the cache it's better to catch it.
|
||||||
invalidEntries?.Add(key);
|
invalidEntries?.Add(key);
|
||||||
|
|
||||||
|
_shaderCount = ++programIndex;
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -144,35 +162,50 @@ namespace Ryujinx.Graphics.Gpu.Shader
|
||||||
hostProgram = _context.Renderer.LoadProgramBinary(hostProgramBinary);
|
hostProgram = _context.Renderer.LoadProgramBinary(hostProgramBinary);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool isHostProgramValid = hostProgram != null;
|
ShaderCompileTask task = new ShaderCompileTask(taskDoneEvent);
|
||||||
|
activeTasks.Add(task);
|
||||||
|
|
||||||
ShaderProgram program;
|
task.OnCompiled(hostProgram, (bool isHostProgramValid, ShaderCompileTask task) =>
|
||||||
ShaderProgramInfo shaderProgramInfo;
|
{
|
||||||
|
ShaderProgram program = null;
|
||||||
|
ShaderProgramInfo shaderProgramInfo = null;
|
||||||
|
|
||||||
// Reconstruct code holder.
|
|
||||||
if (isHostProgramValid)
|
if (isHostProgramValid)
|
||||||
{
|
{
|
||||||
|
// Reconstruct code holder.
|
||||||
|
|
||||||
program = new ShaderProgram(entry.Header.Stage, "");
|
program = new ShaderProgram(entry.Header.Stage, "");
|
||||||
shaderProgramInfo = hostShaderEntries[0].ToShaderProgramInfo();
|
shaderProgramInfo = hostShaderEntries[0].ToShaderProgramInfo();
|
||||||
|
|
||||||
|
ShaderCodeHolder shader = new ShaderCodeHolder(program, shaderProgramInfo, entry.Code);
|
||||||
|
|
||||||
|
_cpProgramsDiskCache.Add(key, new ShaderBundle(hostProgram, shader));
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
|
// If the host program was rejected by the gpu driver or isn't in cache, try to build from program sources again.
|
||||||
|
|
||||||
|
Task compileTask = Task.Run(() =>
|
||||||
{
|
{
|
||||||
IGpuAccessor gpuAccessor = new CachedGpuAccessor(_context, entry.Code, entry.Header.GpuAccessorHeader, entry.TextureDescriptors);
|
IGpuAccessor gpuAccessor = new CachedGpuAccessor(_context, entry.Code, entry.Header.GpuAccessorHeader, entry.TextureDescriptors);
|
||||||
|
|
||||||
program = Translator.CreateContext(0, gpuAccessor, DefaultFlags | TranslationFlags.Compute).Translate(out shaderProgramInfo);
|
program = Translator.CreateContext(0, gpuAccessor, DefaultFlags | TranslationFlags.Compute).Translate(out shaderProgramInfo);
|
||||||
}
|
});
|
||||||
|
|
||||||
|
task.OnTask(compileTask, (bool _, ShaderCompileTask task) =>
|
||||||
|
{
|
||||||
ShaderCodeHolder shader = new ShaderCodeHolder(program, shaderProgramInfo, entry.Code);
|
ShaderCodeHolder shader = new ShaderCodeHolder(program, shaderProgramInfo, entry.Code);
|
||||||
|
|
||||||
// If the host program was rejected by the gpu driver or isn't in cache, try to build from program sources again.
|
|
||||||
if (hostProgram == null)
|
|
||||||
{
|
|
||||||
Logger.Info?.Print(LogClass.Gpu, $"Host shader {key} got invalidated, rebuilding from guest...");
|
Logger.Info?.Print(LogClass.Gpu, $"Host shader {key} got invalidated, rebuilding from guest...");
|
||||||
|
|
||||||
// Compile shader and create program as the shader program binary got invalidated.
|
// Compile shader and create program as the shader program binary got invalidated.
|
||||||
shader.HostShader = _context.Renderer.CompileShader(ShaderStage.Compute, shader.Program.Code);
|
shader.HostShader = _context.Renderer.CompileShader(ShaderStage.Compute, shader.Program.Code);
|
||||||
hostProgram = _context.Renderer.CreateProgram(new IShader[] { shader.HostShader }, null);
|
hostProgram = _context.Renderer.CreateProgram(new IShader[] { shader.HostShader }, null);
|
||||||
|
|
||||||
|
task.OnCompiled(hostProgram, (bool isNewProgramValid, ShaderCompileTask task) =>
|
||||||
|
{
|
||||||
// As the host program was invalidated, save the new entry in the cache.
|
// As the host program was invalidated, save the new entry in the cache.
|
||||||
hostProgramBinary = HostShaderCacheEntry.Create(hostProgram.GetBinary(), new ShaderCodeHolder[] { shader });
|
hostProgramBinary = HostShaderCacheEntry.Create(hostProgram.GetBinary(), new ShaderCodeHolder[] { shader });
|
||||||
|
|
||||||
|
@ -189,9 +222,18 @@ namespace Ryujinx.Graphics.Gpu.Shader
|
||||||
_cacheManager.AddHostProgram(ref key, hostProgramBinary);
|
_cacheManager.AddHostProgram(ref key, hostProgramBinary);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
_cpProgramsDiskCache.Add(key, new ShaderBundle(hostProgram, shader));
|
_cpProgramsDiskCache.Add(key, new ShaderBundle(hostProgram, shader));
|
||||||
|
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
|
||||||
|
return false; // Not finished: still need to compile the host program.
|
||||||
|
});
|
||||||
|
|
||||||
|
return false; // Not finished: translating the program.
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -221,12 +263,19 @@ namespace Ryujinx.Graphics.Gpu.Shader
|
||||||
hostProgram = _context.Renderer.LoadProgramBinary(hostProgramBinary);
|
hostProgram = _context.Renderer.LoadProgramBinary(hostProgramBinary);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool isHostProgramValid = hostProgram != null;
|
ShaderCompileTask task = new ShaderCompileTask(taskDoneEvent);
|
||||||
|
activeTasks.Add(task);
|
||||||
|
|
||||||
// Reconstruct code holder.
|
GuestShaderCacheEntry[] entries = cachedShaderEntries.ToArray();
|
||||||
for (int i = 0; i < cachedShaderEntries.Length; i++)
|
|
||||||
|
task.OnCompiled(hostProgram, (bool isHostProgramValid, ShaderCompileTask task) =>
|
||||||
{
|
{
|
||||||
GuestShaderCacheEntry entry = cachedShaderEntries[i];
|
Task compileTask = Task.Run(() =>
|
||||||
|
{
|
||||||
|
// Reconstruct code holder.
|
||||||
|
for (int i = 0; i < entries.Length; i++)
|
||||||
|
{
|
||||||
|
GuestShaderCacheEntry entry = entries[i];
|
||||||
|
|
||||||
if (entry == null)
|
if (entry == null)
|
||||||
{
|
{
|
||||||
|
@ -281,7 +330,10 @@ namespace Ryujinx.Graphics.Gpu.Shader
|
||||||
|
|
||||||
shaderPrograms.Add(program);
|
shaderPrograms.Add(program);
|
||||||
}
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
task.OnTask(compileTask, (bool _, ShaderCompileTask task) =>
|
||||||
|
{
|
||||||
// If the host program was rejected by the gpu driver or isn't in cache, try to build from program sources again.
|
// If the host program was rejected by the gpu driver or isn't in cache, try to build from program sources again.
|
||||||
if (!isHostProgramValid)
|
if (!isHostProgramValid)
|
||||||
{
|
{
|
||||||
|
@ -308,6 +360,8 @@ namespace Ryujinx.Graphics.Gpu.Shader
|
||||||
|
|
||||||
hostProgram = _context.Renderer.CreateProgram(hostShaders.ToArray(), tfd);
|
hostProgram = _context.Renderer.CreateProgram(hostShaders.ToArray(), tfd);
|
||||||
|
|
||||||
|
task.OnCompiled(hostProgram, (bool isNewProgramValid, ShaderCompileTask task) =>
|
||||||
|
{
|
||||||
// As the host program was invalidated, save the new entry in the cache.
|
// As the host program was invalidated, save the new entry in the cache.
|
||||||
hostProgramBinary = HostShaderCacheEntry.Create(hostProgram.GetBinary(), shaders);
|
hostProgramBinary = HostShaderCacheEntry.Create(hostProgram.GetBinary(), shaders);
|
||||||
|
|
||||||
|
@ -324,12 +378,48 @@ namespace Ryujinx.Graphics.Gpu.Shader
|
||||||
_cacheManager.AddHostProgram(ref key, hostProgramBinary);
|
_cacheManager.AddHostProgram(ref key, hostProgramBinary);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
_gpProgramsDiskCache.Add(key, new ShaderBundle(hostProgram, shaders));
|
_gpProgramsDiskCache.Add(key, new ShaderBundle(hostProgram, shaders));
|
||||||
|
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
|
||||||
|
return false; // Not finished: still need to compile the host program.
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_gpProgramsDiskCache.Add(key, new ShaderBundle(hostProgram, shaders));
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return false; // Not finished: translating the program.
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
_shaderCount = programIndex + 1;
|
_shaderCount = ++programIndex;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Process the queue.
|
||||||
|
for (int i = 0; i < activeTasks.Count; i++)
|
||||||
|
{
|
||||||
|
ShaderCompileTask task = activeTasks[i];
|
||||||
|
|
||||||
|
if (task.IsDone())
|
||||||
|
{
|
||||||
|
activeTasks.RemoveAt(i--);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (activeTasks.Count == maxTaskCount)
|
||||||
|
{
|
||||||
|
// Wait for a task to be done, or for 1ms.
|
||||||
|
// Host shader compilation cannot signal when it is done,
|
||||||
|
// so the 1ms timeout is required to poll status.
|
||||||
|
|
||||||
|
taskDoneEvent.WaitOne(1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isReadOnly)
|
if (!isReadOnly)
|
||||||
|
@ -458,6 +548,8 @@ namespace Ryujinx.Graphics.Gpu.Shader
|
||||||
|
|
||||||
IProgram hostProgram = _context.Renderer.CreateProgram(new IShader[] { shader.HostShader }, null);
|
IProgram hostProgram = _context.Renderer.CreateProgram(new IShader[] { shader.HostShader }, null);
|
||||||
|
|
||||||
|
hostProgram.CheckProgramLink(true);
|
||||||
|
|
||||||
byte[] hostProgramBinary = HostShaderCacheEntry.Create(hostProgram.GetBinary(), new ShaderCodeHolder[] { shader });
|
byte[] hostProgramBinary = HostShaderCacheEntry.Create(hostProgram.GetBinary(), new ShaderCodeHolder[] { shader });
|
||||||
|
|
||||||
cpShader = new ShaderBundle(hostProgram, shader);
|
cpShader = new ShaderBundle(hostProgram, shader);
|
||||||
|
@ -598,6 +690,8 @@ namespace Ryujinx.Graphics.Gpu.Shader
|
||||||
|
|
||||||
IProgram hostProgram = _context.Renderer.CreateProgram(hostShaders.ToArray(), tfd);
|
IProgram hostProgram = _context.Renderer.CreateProgram(hostShaders.ToArray(), tfd);
|
||||||
|
|
||||||
|
hostProgram.CheckProgramLink(true);
|
||||||
|
|
||||||
byte[] hostProgramBinary = HostShaderCacheEntry.Create(hostProgram.GetBinary(), shaders);
|
byte[] hostProgramBinary = HostShaderCacheEntry.Create(hostProgram.GetBinary(), shaders);
|
||||||
|
|
||||||
gpShaders = new ShaderBundle(hostProgram, shaders);
|
gpShaders = new ShaderBundle(hostProgram, shaders);
|
||||||
|
|
94
Ryujinx.Graphics.Gpu/Shader/ShaderCompileTask.cs
Normal file
94
Ryujinx.Graphics.Gpu/Shader/ShaderCompileTask.cs
Normal file
|
@ -0,0 +1,94 @@
|
||||||
|
using Ryujinx.Graphics.GAL;
|
||||||
|
using System;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace Ryujinx.Graphics.Gpu.Shader
|
||||||
|
{
|
||||||
|
delegate bool ShaderCompileTaskCallback(bool success, ShaderCompileTask task);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// A class that represents a shader compilation.
|
||||||
|
/// </summary>
|
||||||
|
class ShaderCompileTask
|
||||||
|
{
|
||||||
|
private bool _compiling;
|
||||||
|
|
||||||
|
private Task _programsTask;
|
||||||
|
private IProgram _program;
|
||||||
|
|
||||||
|
private ShaderCompileTaskCallback _action;
|
||||||
|
private AutoResetEvent _taskDoneEvent;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Create a new shader compile task, with an event to signal whenever a subtask completes.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="taskDoneEvent">Event to signal when a subtask completes</param>
|
||||||
|
public ShaderCompileTask(AutoResetEvent taskDoneEvent)
|
||||||
|
{
|
||||||
|
_taskDoneEvent = taskDoneEvent;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Check the completion status of the shader compile task, and run callbacks on step completion.
|
||||||
|
/// Calling this periodically is required to progress through steps of the compilation.
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>True if the task is complete, false if it is in progress</returns>
|
||||||
|
public bool IsDone()
|
||||||
|
{
|
||||||
|
if (_compiling)
|
||||||
|
{
|
||||||
|
ProgramLinkStatus status = _program.CheckProgramLink(false);
|
||||||
|
|
||||||
|
if (status != ProgramLinkStatus.Incomplete)
|
||||||
|
{
|
||||||
|
return _action(status == ProgramLinkStatus.Success, this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Waiting on the task.
|
||||||
|
|
||||||
|
if (_programsTask.IsCompleted)
|
||||||
|
{
|
||||||
|
return _action(true, this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Run a callback when the specified task has completed.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="task">The task object that needs to complete</param>
|
||||||
|
/// <param name="action">The action to perform when it is complete</param>
|
||||||
|
public void OnTask(Task task, ShaderCompileTaskCallback action)
|
||||||
|
{
|
||||||
|
_compiling = false;
|
||||||
|
|
||||||
|
_programsTask = task;
|
||||||
|
_action = action;
|
||||||
|
|
||||||
|
task.ContinueWith(task => _taskDoneEvent.Set());
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Run a callback when the specified program has been linked.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="task">The program that needs to be linked</param>
|
||||||
|
/// <param name="action">The action to perform when linking is complete</param>
|
||||||
|
public void OnCompiled(IProgram program, ShaderCompileTaskCallback action)
|
||||||
|
{
|
||||||
|
_compiling = true;
|
||||||
|
|
||||||
|
_program = program;
|
||||||
|
_action = action;
|
||||||
|
|
||||||
|
if (program == null)
|
||||||
|
{
|
||||||
|
action(false, this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -10,6 +10,7 @@ namespace Ryujinx.Graphics.OpenGL
|
||||||
private static readonly Lazy<bool> _supportsPolygonOffsetClamp = new Lazy<bool>(() => HasExtension("GL_EXT_polygon_offset_clamp"));
|
private static readonly Lazy<bool> _supportsPolygonOffsetClamp = new Lazy<bool>(() => HasExtension("GL_EXT_polygon_offset_clamp"));
|
||||||
private static readonly Lazy<bool> _supportsViewportSwizzle = new Lazy<bool>(() => HasExtension("GL_NV_viewport_swizzle"));
|
private static readonly Lazy<bool> _supportsViewportSwizzle = new Lazy<bool>(() => HasExtension("GL_NV_viewport_swizzle"));
|
||||||
private static readonly Lazy<bool> _supportsSeamlessCubemapPerTexture = new Lazy<bool>(() => HasExtension("GL_ARB_seamless_cubemap_per_texture"));
|
private static readonly Lazy<bool> _supportsSeamlessCubemapPerTexture = new Lazy<bool>(() => HasExtension("GL_ARB_seamless_cubemap_per_texture"));
|
||||||
|
private static readonly Lazy<bool> _supportsParallelShaderCompile = new Lazy<bool>(() => HasExtension("GL_ARB_parallel_shader_compile"));
|
||||||
|
|
||||||
private static readonly Lazy<int> _maximumComputeSharedMemorySize = new Lazy<int>(() => GetLimit(All.MaxComputeSharedMemorySize));
|
private static readonly Lazy<int> _maximumComputeSharedMemorySize = new Lazy<int>(() => GetLimit(All.MaxComputeSharedMemorySize));
|
||||||
private static readonly Lazy<int> _storageBufferOffsetAlignment = new Lazy<int>(() => GetLimit(All.ShaderStorageBufferOffsetAlignment));
|
private static readonly Lazy<int> _storageBufferOffsetAlignment = new Lazy<int>(() => GetLimit(All.ShaderStorageBufferOffsetAlignment));
|
||||||
|
@ -34,6 +35,7 @@ namespace Ryujinx.Graphics.OpenGL
|
||||||
public static bool SupportsPolygonOffsetClamp => _supportsPolygonOffsetClamp.Value;
|
public static bool SupportsPolygonOffsetClamp => _supportsPolygonOffsetClamp.Value;
|
||||||
public static bool SupportsViewportSwizzle => _supportsViewportSwizzle.Value;
|
public static bool SupportsViewportSwizzle => _supportsViewportSwizzle.Value;
|
||||||
public static bool SupportsSeamlessCubemapPerTexture => _supportsSeamlessCubemapPerTexture.Value;
|
public static bool SupportsSeamlessCubemapPerTexture => _supportsSeamlessCubemapPerTexture.Value;
|
||||||
|
public static bool SupportsParallelShaderCompile => _supportsParallelShaderCompile.Value;
|
||||||
public static bool SupportsNonConstantTextureOffset => _gpuVendor.Value == GpuVendor.Nvidia;
|
public static bool SupportsNonConstantTextureOffset => _gpuVendor.Value == GpuVendor.Nvidia;
|
||||||
public static bool RequiresSyncFlush => _gpuVendor.Value == GpuVendor.Amd || _gpuVendor.Value == GpuVendor.IntelWindows || _gpuVendor.Value == GpuVendor.IntelUnix;
|
public static bool RequiresSyncFlush => _gpuVendor.Value == GpuVendor.Amd || _gpuVendor.Value == GpuVendor.IntelWindows || _gpuVendor.Value == GpuVendor.IntelUnix;
|
||||||
public static bool SupportsMismatchingViewFormat => _gpuVendor.Value != GpuVendor.Amd && _gpuVendor.Value != GpuVendor.IntelWindows;
|
public static bool SupportsMismatchingViewFormat => _gpuVendor.Value != GpuVendor.Amd && _gpuVendor.Value != GpuVendor.IntelWindows;
|
||||||
|
|
|
@ -13,11 +13,26 @@ namespace Ryujinx.Graphics.OpenGL
|
||||||
{
|
{
|
||||||
public int Handle { get; private set; }
|
public int Handle { get; private set; }
|
||||||
|
|
||||||
public int FragmentIsBgraUniform { get; }
|
public int FragmentIsBgraUniform { get; private set; }
|
||||||
public int FragmentRenderScaleUniform { get; }
|
public int FragmentRenderScaleUniform { get; private set; }
|
||||||
public int ComputeRenderScaleUniform { get; }
|
public int ComputeRenderScaleUniform { get; private set; }
|
||||||
|
|
||||||
public bool IsLinked { get; private set; }
|
public bool IsLinked
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
if (_status == ProgramLinkStatus.Incomplete)
|
||||||
|
{
|
||||||
|
CheckProgramLink(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
return _status == ProgramLinkStatus.Success;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool _initialized;
|
||||||
|
private ProgramLinkStatus _status = ProgramLinkStatus.Incomplete;
|
||||||
|
private IShader[] _shaders;
|
||||||
|
|
||||||
public Program(IShader[] shaders, TransformFeedbackDescriptor[] transformFeedbackDescriptors)
|
public Program(IShader[] shaders, TransformFeedbackDescriptor[] transformFeedbackDescriptors)
|
||||||
{
|
{
|
||||||
|
@ -82,18 +97,7 @@ namespace Ryujinx.Graphics.OpenGL
|
||||||
|
|
||||||
GL.LinkProgram(Handle);
|
GL.LinkProgram(Handle);
|
||||||
|
|
||||||
for (int index = 0; index < shaders.Length; index++)
|
_shaders = shaders;
|
||||||
{
|
|
||||||
int shaderHandle = ((Shader)shaders[index]).Handle;
|
|
||||||
|
|
||||||
GL.DetachShader(Handle, shaderHandle);
|
|
||||||
}
|
|
||||||
|
|
||||||
CheckProgramLink();
|
|
||||||
|
|
||||||
FragmentIsBgraUniform = GL.GetUniformLocation(Handle, "is_bgra");
|
|
||||||
FragmentRenderScaleUniform = GL.GetUniformLocation(Handle, "fp_renderScale");
|
|
||||||
ComputeRenderScaleUniform = GL.GetUniformLocation(Handle, "cp_renderScale");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Program(ReadOnlySpan<byte> code)
|
public Program(ReadOnlySpan<byte> code)
|
||||||
|
@ -109,32 +113,60 @@ namespace Ryujinx.Graphics.OpenGL
|
||||||
GL.ProgramBinary(Handle, binaryFormat, (IntPtr)ptr, code.Length - 4);
|
GL.ProgramBinary(Handle, binaryFormat, (IntPtr)ptr, code.Length - 4);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
CheckProgramLink();
|
|
||||||
|
|
||||||
FragmentIsBgraUniform = GL.GetUniformLocation(Handle, "is_bgra");
|
|
||||||
FragmentRenderScaleUniform = GL.GetUniformLocation(Handle, "fp_renderScale");
|
|
||||||
ComputeRenderScaleUniform = GL.GetUniformLocation(Handle, "cp_renderScale");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Bind()
|
public void Bind()
|
||||||
{
|
{
|
||||||
|
if (!_initialized)
|
||||||
|
{
|
||||||
|
FragmentIsBgraUniform = GL.GetUniformLocation(Handle, "is_bgra");
|
||||||
|
FragmentRenderScaleUniform = GL.GetUniformLocation(Handle, "fp_renderScale");
|
||||||
|
ComputeRenderScaleUniform = GL.GetUniformLocation(Handle, "cp_renderScale");
|
||||||
|
|
||||||
|
_initialized = true;
|
||||||
|
}
|
||||||
|
|
||||||
GL.UseProgram(Handle);
|
GL.UseProgram(Handle);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void CheckProgramLink()
|
public ProgramLinkStatus CheckProgramLink(bool blocking)
|
||||||
{
|
{
|
||||||
|
if (!blocking && HwCapabilities.SupportsParallelShaderCompile)
|
||||||
|
{
|
||||||
|
GL.GetProgram(Handle, (GetProgramParameterName)ArbParallelShaderCompile.CompletionStatusArb, out int completed);
|
||||||
|
|
||||||
|
if (completed == 0)
|
||||||
|
{
|
||||||
|
return ProgramLinkStatus.Incomplete;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
GL.GetProgram(Handle, GetProgramParameterName.LinkStatus, out int status);
|
GL.GetProgram(Handle, GetProgramParameterName.LinkStatus, out int status);
|
||||||
|
|
||||||
|
if (_shaders != null)
|
||||||
|
{
|
||||||
|
for (int index = 0; index < _shaders.Length; index++)
|
||||||
|
{
|
||||||
|
int shaderHandle = ((Shader)_shaders[index]).Handle;
|
||||||
|
|
||||||
|
GL.DetachShader(Handle, shaderHandle);
|
||||||
|
}
|
||||||
|
|
||||||
|
_shaders = null;
|
||||||
|
}
|
||||||
|
|
||||||
if (status == 0)
|
if (status == 0)
|
||||||
{
|
{
|
||||||
// Use GL.GetProgramInfoLog(Handle), it may be too long to print on the log.
|
// Use GL.GetProgramInfoLog(Handle), it may be too long to print on the log.
|
||||||
|
_status = ProgramLinkStatus.Failure;
|
||||||
Logger.Debug?.Print(LogClass.Gpu, "Shader linking failed.");
|
Logger.Debug?.Print(LogClass.Gpu, "Shader linking failed.");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
IsLinked = true;
|
_status = ProgramLinkStatus.Success;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return _status;
|
||||||
}
|
}
|
||||||
|
|
||||||
public byte[] GetBinary()
|
public byte[] GetBinary()
|
||||||
|
|
|
@ -131,6 +131,11 @@ namespace Ryujinx.Graphics.OpenGL
|
||||||
|
|
||||||
PrintGpuInformation();
|
PrintGpuInformation();
|
||||||
|
|
||||||
|
if (HwCapabilities.SupportsParallelShaderCompile)
|
||||||
|
{
|
||||||
|
GL.Arb.MaxShaderCompilerThreads(Math.Min(Environment.ProcessorCount, 8));
|
||||||
|
}
|
||||||
|
|
||||||
_counters.Initialize();
|
_counters.Initialize();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -178,16 +183,7 @@ namespace Ryujinx.Graphics.OpenGL
|
||||||
|
|
||||||
public IProgram LoadProgramBinary(byte[] programBinary)
|
public IProgram LoadProgramBinary(byte[] programBinary)
|
||||||
{
|
{
|
||||||
Program program = new Program(programBinary);
|
return new Program(programBinary);
|
||||||
|
|
||||||
if (program.IsLinked)
|
|
||||||
{
|
|
||||||
return program;
|
|
||||||
}
|
|
||||||
|
|
||||||
program.Dispose();
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void CreateSync(ulong id)
|
public void CreateSync(ulong id)
|
||||||
|
|
|
@ -2,6 +2,7 @@ using ARMeilleure.Translation.PTC;
|
||||||
using FFmpeg.AutoGen;
|
using FFmpeg.AutoGen;
|
||||||
using Gtk;
|
using Gtk;
|
||||||
using Ryujinx.Common.Configuration;
|
using Ryujinx.Common.Configuration;
|
||||||
|
using Ryujinx.Common.GraphicsDriver;
|
||||||
using Ryujinx.Common.Logging;
|
using Ryujinx.Common.Logging;
|
||||||
using Ryujinx.Common.System;
|
using Ryujinx.Common.System;
|
||||||
using Ryujinx.Common.SystemInfo;
|
using Ryujinx.Common.SystemInfo;
|
||||||
|
@ -147,6 +148,9 @@ namespace Ryujinx
|
||||||
// Logging system information.
|
// Logging system information.
|
||||||
PrintSystemInfo();
|
PrintSystemInfo();
|
||||||
|
|
||||||
|
// Enable OGL multithreading on the driver, when available.
|
||||||
|
DriverUtilities.ToggleOGLThreading(true);
|
||||||
|
|
||||||
// Initialize Gtk.
|
// Initialize Gtk.
|
||||||
Application.Init();
|
Application.Init();
|
||||||
|
|
||||||
|
@ -158,9 +162,6 @@ namespace Ryujinx
|
||||||
UserErrorDialog.CreateUserErrorDialog(UserError.NoKeys);
|
UserErrorDialog.CreateUserErrorDialog(UserError.NoKeys);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Force dedicated GPU if we can.
|
|
||||||
ForceDedicatedGpu.Nvidia();
|
|
||||||
|
|
||||||
// Show the main window UI.
|
// Show the main window UI.
|
||||||
MainWindow mainWindow = new MainWindow();
|
MainWindow mainWindow = new MainWindow();
|
||||||
mainWindow.Show();
|
mainWindow.Show();
|
||||||
|
|
Loading…
Reference in a new issue