manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2024-11-15 01:25:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

OpenGL: Mask out all color outputs with no fragment shader (#6341)

Browse source 
* OpenGL: Mask out all color outputs with no fragment shader

This appears to match Vulkan's behaviour, which is needed for stencil shadows in Penny's Big Breakaway. It's far from the only issue, you can try the Full Bindless PR if you want to see it in a more intact state.

* Remove unused member
This commit is contained in:
riperiperi 2024-02-22 17:43:19 +00:00 committed by GitHub
parent c43fb92bbf
commit 57d8afd0c9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Ryujinx.Graphics.OpenGL/Pipeline.cs
View file

@ -1117,7 +1117,7 @@ namespace Ryujinx.Graphics.OpenGL
prg.Bind(); prg.Bind();
} }
if (prg.HasFragmentShader && _fragmentOutputMap != (uint)prg.FragmentOutputMap) if (_fragmentOutputMap != (uint)prg.FragmentOutputMap)
{ {
_fragmentOutputMap = (uint)prg.FragmentOutputMap; _fragmentOutputMap = (uint)prg.FragmentOutputMap;

9
src/Ryujinx.Graphics.OpenGL/Program.cs
View file

@ -30,7 +30,6 @@ namespace Ryujinx.Graphics.OpenGL
private ProgramLinkStatus _status = ProgramLinkStatus.Incomplete; private ProgramLinkStatus _status = ProgramLinkStatus.Incomplete;
private int[] _shaderHandles; private int[] _shaderHandles;
public bool HasFragmentShader;
public int FragmentOutputMap { get; } public int FragmentOutputMap { get; }
public Program(ShaderSource[] shaders, int fragmentOutputMap) public Program(ShaderSource[] shaders, int fragmentOutputMap)
@ -40,6 +39,7 @@ namespace Ryujinx.Graphics.OpenGL
GL.ProgramParameter(Handle, ProgramParameterName.ProgramBinaryRetrievableHint, 1); GL.ProgramParameter(Handle, ProgramParameterName.ProgramBinaryRetrievableHint, 1);
_shaderHandles = new int[shaders.Length]; _shaderHandles = new int[shaders.Length];
bool hasFragmentShader = false;
for (int index = 0; index < shaders.Length; index++) for (int index = 0; index < shaders.Length; index++)
{ {
@ -47,7 +47,7 @@ namespace Ryujinx.Graphics.OpenGL
if (shader.Stage == ShaderStage.Fragment) if (shader.Stage == ShaderStage.Fragment)
{ {
HasFragmentShader = true; hasFragmentShader = true;
} }
int shaderHandle = GL.CreateShader(shader.Stage.Convert()); int shaderHandle = GL.CreateShader(shader.Stage.Convert());
@ -71,7 +71,7 @@ namespace Ryujinx.Graphics.OpenGL
GL.LinkProgram(Handle); GL.LinkProgram(Handle);
FragmentOutputMap = fragmentOutputMap; FragmentOutputMap = hasFragmentShader ? fragmentOutputMap : 0;
} }
public Program(ReadOnlySpan<byte> code, bool hasFragmentShader, int fragmentOutputMap) public Program(ReadOnlySpan<byte> code, bool hasFragmentShader, int fragmentOutputMap)
@ -91,8 +91,7 @@ namespace Ryujinx.Graphics.OpenGL
} }
} }
HasFragmentShader = hasFragmentShader; FragmentOutputMap = hasFragmentShader ? fragmentOutputMap : 0;
FragmentOutputMap = fragmentOutputMap;
} }
public void Bind() public void Bind()