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

Fix a few small regressions (color mask not being set, primitive restart not being enabled, and vertex buffer size being calculated improperly when vertex base is non-zero)

Browse source
This commit is contained in:
gdkchan 2018-12-09 16:29:11 -03:00
commit 7c39c731e2
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -120,6 +120,8 @@ namespace Ryujinx.Graphics.Graphics3d
//Ensure that all components are enabled by default. //Ensure that all components are enabled by default.
//FIXME: Is this correct? //FIXME: Is this correct?
WriteRegister(NvGpuEngine3dReg.ColorMaskN, 0x1111);
Gpu.Renderer.RenderTarget.FramebufferSrgb = true; Gpu.Renderer.RenderTarget.FramebufferSrgb = true;
for (int Index = 0; Index < RenderTargetsCount; Index++) for (int Index = 0; Index < RenderTargetsCount; Index++)
@ -622,6 +624,8 @@ namespace Ryujinx.Graphics.Graphics3d
{ {
bool PrimitiveRestartEnabled = ReadRegisterBool(NvGpuEngine3dReg.PrimRestartEnable); bool PrimitiveRestartEnabled = ReadRegisterBool(NvGpuEngine3dReg.PrimRestartEnable);
Gpu.Renderer.Pipeline.SetPrimitiveRestartEnabled(PrimitiveRestartEnabled);
if (PrimitiveRestartEnabled) if (PrimitiveRestartEnabled)
{ {
int Index = ReadRegister(NvGpuEngine3dReg.PrimRestartIndex); int Index = ReadRegister(NvGpuEngine3dReg.PrimRestartIndex);
@ -800,6 +804,7 @@ namespace Ryujinx.Graphics.Graphics3d
int IndexEntryFmt = ReadRegister(NvGpuEngine3dReg.IndexArrayFormat); int IndexEntryFmt = ReadRegister(NvGpuEngine3dReg.IndexArrayFormat);
int IndexFirst = ReadRegister(NvGpuEngine3dReg.IndexBatchFirst); int IndexFirst = ReadRegister(NvGpuEngine3dReg.IndexBatchFirst);
int IndexCount = ReadRegister(NvGpuEngine3dReg.IndexBatchCount); int IndexCount = ReadRegister(NvGpuEngine3dReg.IndexBatchCount);
int VertexBase = ReadRegister(NvGpuEngine3dReg.VertexArrayElemBase);
int PrimCtrl = ReadRegister(NvGpuEngine3dReg.VertexBeginGl); int PrimCtrl = ReadRegister(NvGpuEngine3dReg.VertexBeginGl);
GalPrimitiveType PrimType = (GalPrimitiveType)(PrimCtrl & 0xffff); GalPrimitiveType PrimType = (GalPrimitiveType)(PrimCtrl & 0xffff);
@ -975,7 +980,9 @@ namespace Ryujinx.Graphics.Graphics3d
long VbSize = (VbEndPos - VbPosition) + 1; long VbSize = (VbEndPos - VbPosition) + 1;
long MaxVbSize = (IndexCount != 0 ? IbVtxCount : VertexFirst + VertexCount) * Stride; long MaxVbSize = (IndexCount != 0
? VertexBase + IbVtxCount
: VertexFirst + VertexCount) * Stride;
if (MaxVbSize < VbSize) if (MaxVbSize < VbSize)
{ {