N-archive/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Scissor test fix (#563)

Browse source 
* Handle negative viewport coordinates

* Disable scissor before framebuffer blit

* Comment to explain scissor disable will be reenabled if needed

* Comma and spelling mistake
This commit is contained in:
BaronKiko 2019-02-01 01:37:07 +00:00 committed by gdkchan
parent d191b256a6
commit f5b4f6ccc4
3 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Ryujinx.Graphics/Gal/OpenGL/OGLPipeline.cs
View file

@ -278,11 +278,9 @@ namespace Ryujinx.Graphics.Gal.OpenGL
{ {
forceUpdate = false; forceUpdate = false;
if (New.ScissorTestEnabled[Index] != Old.ScissorTestEnabled[Index])
{
if (New.ScissorTestEnabled[Index]) if (New.ScissorTestEnabled[Index])
{ {
// If there is only 1 scissor test geometry shaders are disables so the scissor test applies to all viewports // If there is only 1 scissor test, geometry shaders are disabled so the scissor test applies to all viewports
if (New.ScissorTestCount == 1) if (New.ScissorTestCount == 1)
{ {
GL.Enable(EnableCap.ScissorTest); GL.Enable(EnableCap.ScissorTest);
@ -297,7 +295,6 @@ namespace Ryujinx.Graphics.Gal.OpenGL
{ {
GL.Disable(IndexedEnableCap.ScissorTest, Index); GL.Disable(IndexedEnableCap.ScissorTest, Index);
} }
}
if (New.ScissorTestEnabled[Index] && if (New.ScissorTestEnabled[Index] &&
(New.ScissorTestX[Index] != Old.ScissorTestX[Index] || (New.ScissorTestX[Index] != Old.ScissorTestX[Index] ||

3
Ryujinx.Graphics/Gal/OpenGL/OGLRenderTarget.cs
View file

@ -367,6 +367,9 @@ namespace Ryujinx.Graphics.Gal.OpenGL
GL.Disable(EnableCap.FramebufferSrgb); GL.Disable(EnableCap.FramebufferSrgb);
// Will be re-enabled if needed while binding, called before any game GL calls
GL.Disable(EnableCap.ScissorTest);
GL.BlitFramebuffer( GL.BlitFramebuffer(
SrcX0, SrcX0,
SrcY0, SrcY0,

8
Ryujinx.Graphics/Graphics3d/NvGpuEngine3d.cs
View file

@ -419,7 +419,7 @@ namespace Ryujinx.Graphics.Graphics3d
// Once geometry shaders are fixed it should be equal to GalPipelineState.RenderTargetCount when shader loaded, otherwise equal to 1 // Once geometry shaders are fixed it should be equal to GalPipelineState.RenderTargetCount when shader loaded, otherwise equal to 1
State.ScissorTestCount = 1; State.ScissorTestCount = 1;
for (int Index = 0; Index < GalPipelineState.RenderTargetsCount; Index++) for (int Index = 0; Index < State.ScissorTestCount; Index++)
{ {
State.ScissorTestEnabled[Index] = ReadRegisterBool(NvGpuEngine3dReg.ScissorEnable + Index * 4); State.ScissorTestEnabled[Index] = ReadRegisterBool(NvGpuEngine3dReg.ScissorEnable + Index * 4);
@ -438,6 +438,12 @@ namespace Ryujinx.Graphics.Graphics3d
if ((int)State.FlipY == -1) if ((int)State.FlipY == -1)
{ {
State.ScissorTestY[Index] = ViewportHeight - State.ScissorTestY[Index] - State.ScissorTestHeight[Index]; State.ScissorTestY[Index] = ViewportHeight - State.ScissorTestY[Index] - State.ScissorTestHeight[Index];
// Handle negative viewpont coordinate
if (State.ScissorTestY[Index] < 0)
{
State.ScissorTestY[Index] = 0;
}
} }
} }
} }