mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct height calculation

Browse source
This commit is contained in:
Andy Adshead 2019-01-06 02:35:10 +00:00
commit 1b77002c7e
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,6 +24,9 @@ namespace Ryujinx.Graphics.Graphics3d
private ConstBuffer[][] ConstBuffers; private ConstBuffer[][] ConstBuffers;
// Height kept for flipping y axis
private int ViewportHeight = 0;
private int CurrentInstance = 0; private int CurrentInstance = 0;
public NvGpuEngine3d(NvGpu Gpu) public NvGpuEngine3d(NvGpu Gpu)
@ -209,6 +212,8 @@ namespace Ryujinx.Graphics.Graphics3d
Gpu.ResourceManager.SendColorBuffer(Vmm, Key, FbIndex, Image); Gpu.ResourceManager.SendColorBuffer(Vmm, Key, FbIndex, Image);
ViewportHeight = VpH;
Gpu.Renderer.RenderTarget.SetViewport(FbIndex, VpX, VpY, VpW, VpH); Gpu.Renderer.RenderTarget.SetViewport(FbIndex, VpX, VpY, VpW, VpH);
} }
@ -410,8 +415,6 @@ namespace Ryujinx.Graphics.Graphics3d
private void SetScissor(GalPipelineState State) private void SetScissor(GalPipelineState State)
{ {
int Height = ReadRegister(NvGpuEngine3dReg.FrameBufferNHeight);
// FIXME: Stubbed, only the first scissor test is valid without a geometry shader loaded. At time of writing geometry shaders are also stubbed. // FIXME: Stubbed, only the first scissor test is valid without a geometry shader loaded. At time of writing geometry shaders are also stubbed.
// 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;
@ -434,7 +437,7 @@ namespace Ryujinx.Graphics.Graphics3d
// Y coordinates may have to be flipped // Y coordinates may have to be flipped
if ((int)State.FlipY == -1) if ((int)State.FlipY == -1)
{ {
State.ScissorTestY[Index] = Height - State.ScissorTestY[Index] - State.ScissorTestHeight[Index]; State.ScissorTestY[Index] = ViewportHeight - State.ScissorTestY[Index] - State.ScissorTestHeight[Index];
} }
} }
} }