manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2025-02-21 16:43:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make more robust to shader compilation failure

Browse source 
- Don't freeze when GLSL compilation fails
- Background SPIR-V pipeline compile failure results in skipped draws, similar to GLSL compilation failure.
This commit is contained in:
riperiperi 2022-03-11 21:21:08 +00:00
parent d45b28f6b7
commit 089fa6bd54
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Ryujinx.Graphics.Vulkan/ShaderCollection.cs
View file

@ -135,6 +135,13 @@ namespace Ryujinx.Graphics.Vulkan
{
await Task.WhenAll(_shaders.Select(shader => ((Shader)shader).CompileTask));
if (_shaders.Any(shader => ((Shader)shader).CompileStatus == ProgramLinkStatus.Failure))
{
LinkStatus = ProgramLinkStatus.Failure;
return;
}
try
{
if (_isCompute)
@ -149,6 +156,8 @@ namespace Ryujinx.Graphics.Vulkan
catch (VulkanException e)
{
Logger.Error?.PrintMsg(LogClass.Gpu, $"Background Compilation failed: {e.Message}");
LinkStatus = ProgramLinkStatus.Failure;
}
}
@ -172,7 +181,11 @@ namespace Ryujinx.Graphics.Vulkan
_infos[i] = shader.GetInfo();
}
LinkStatus = resultStatus;
// If the link status was already set as failure by background compilation, prefer that decision.
if (LinkStatus != ProgramLinkStatus.Failure)
{
LinkStatus = resultStatus;
}
_initialized = true;
}
@ -265,6 +278,11 @@ namespace Ryujinx.Graphics.Vulkan
if (blocking)
{
_compileTask.Wait();
if (LinkStatus == ProgramLinkStatus.Failure)
{
return ProgramLinkStatus.Failure;
}
}
else
{