Rion/R
1
0
Fork 0
forked from Mirror/Ryujinx
Code Pull requests Activity

End shader decoding when reaching a block that starts with an infinite loop (after BRX) (#2367)

Browse source 
* End shader decoding when reaching an infinite loop

The NV shader compiler puts these at the end of shaders.

* Update shader cache version
This commit is contained in:
riperiperi 2021-06-15 01:09:59 +01:00 committed by GitHub
parent bfcc6a8ad6
commit 7ff1f9aa12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs
View file

@ -36,7 +36,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
/// <summary>
/// Version of the codegen (to be changed when codegen or guest format change).
/// </summary>
private const ulong ShaderCodeGenVersion = 2329;
private const ulong ShaderCodeGenVersion = 2367;
// Progress reporting helpers
private volatile int _shaderCount;
@ -955,4 +955,4 @@ namespace Ryujinx.Graphics.Gpu.Shader
_cacheManager?.Dispose();
}
}
}
}

4
Ryujinx.Graphics.Shader/Decoders/Decoder.cs
View file

@ -9,6 +9,8 @@ namespace Ryujinx.Graphics.Shader.Decoders
{
static class Decoder
{
public const ulong ShaderEndDelimiter = 0xe2400fffff87000f;
public static Block[][] Decode(IGpuAccessor gpuAccessor, ulong startAddress, out bool hasBindless)
{
hasBindless = false;
@ -190,7 +192,7 @@ namespace Ryujinx.Graphics.Shader.Decoders
ulong inst = gpuAccessor.MemoryRead<ulong>(startAdddress + currBlock.EndAddress);
return inst != 0UL;
return inst != 0UL && inst != ShaderEndDelimiter;
}
private static bool BinarySearch(List<Block> blocks, ulong address, out int index)