vance/ryujinx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not add more code after alpha test discard on fragment shader (#5529)

Browse Source 
* Do not add more code after alpha test discard on fragment shader

* Shader cache version bump
This commit is contained in:
gdkchan 2023-08-07 12:20:37 -03:00 committed by GitHub
parent 3ab0a71c7b
commit 42750a74f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs
View File

@ -22,7 +22,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
private const ushort FileFormatVersionMajor = 1;
private const ushort FileFormatVersionMinor = 2;
private const uint FileFormatVersionPacked = ((uint)FileFormatVersionMajor << 16) | FileFormatVersionMinor;
private const uint CodeGenVersion = 4675;
private const uint CodeGenVersion = 5529;
private const string SharedTocFileName = "shared.toc";
private const string SharedDataFileName = "shared.data";

10
src/Ryujinx.Graphics.Shader/Instructions/InstEmitFlowControl.cs
View File

@ -162,9 +162,11 @@ namespace Ryujinx.Graphics.Shader.Instructions
if (op.Ccc == Ccc.T)
{
context.PrepareForReturn();
if (context.PrepareForReturn())
{
context.Return();
}
}
else
{
Operand cond = GetCondition(context, op.Ccc, IrConsts.False);
@ -174,8 +176,12 @@ namespace Ryujinx.Graphics.Shader.Instructions
{
Operand lblSkip = Label();
context.BranchIfFalse(lblSkip, cond);
context.PrepareForReturn();
if (context.PrepareForReturn())
{
context.Return();
}
context.MarkLabel(lblSkip);
}
}

16
src/Ryujinx.Graphics.Shader/Translation/EmitterContext.cs
View File

@ -304,11 +304,11 @@ namespace Ryujinx.Graphics.Shader.Translation
PrepareForVertexReturn();
}
public void PrepareForReturn()
public bool PrepareForReturn()
{
if (IsNonMain)
{
return;
return true;
}
if (Config.LastInVertexPipeline &&
@ -383,13 +383,13 @@ namespace Ryujinx.Graphics.Shader.Translation
AlphaTestOp alphaTestOp = Config.GpuAccessor.QueryAlphaTestCompare();
if (alphaTestOp != AlphaTestOp.Always && (Config.OmapTargets & 8) != 0)
if (alphaTestOp != AlphaTestOp.Always)
{
if (alphaTestOp == AlphaTestOp.Never)
{
this.Discard();
}
else
else if ((Config.OmapTargets & 8) != 0)
{
Instruction comparator = alphaTestOp switch
{
@ -415,6 +415,12 @@ namespace Ryujinx.Graphics.Shader.Translation
}
}
// We don't need to output anything if alpha test always fails.
if (alphaTestOp == AlphaTestOp.Never)
{
return false;
}
int regIndexBase = 0;
for (int rtIndex = 0; rtIndex < 8; rtIndex++)
@ -462,6 +468,8 @@ namespace Ryujinx.Graphics.Shader.Translation
}
}
}
return true;
}
private void GenerateAlphaToCoverageDitherDiscard()