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

Do not attempt to read unused attribute, fix attributes count (#520)

Browse source
This commit is contained in:
gdkchan 2018-12-26 17:29:50 -02:00 committed by GitHub
parent 0f5b6dfbe8
commit 1fd1ec5664
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ryujinx.Graphics/Gal/Shader/GlslDecompiler.cs
View file

@ -878,7 +878,7 @@ namespace Ryujinx.Graphics.Gal.Shader
} }
} }
if (DeclInfo.Index >= 16) if (DeclInfo.Index >= 32)
{ {
throw new InvalidOperationException($"Shader attribute offset {Abuf.Offs} is invalid."); throw new InvalidOperationException($"Shader attribute offset {Abuf.Offs} is invalid.");
} }

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

@ -734,6 +734,11 @@ namespace Ryujinx.Graphics.Graphics3d
long VbPosition = MakeInt64From2xInt32(NvGpuEngine3dReg.VertexArrayNAddress + ArrayIndex * 4); long VbPosition = MakeInt64From2xInt32(NvGpuEngine3dReg.VertexArrayNAddress + ArrayIndex * 4);
if (VbPosition == 0)
{
continue;
}
bool IsConst = ((Packed >> 6) & 1) != 0; bool IsConst = ((Packed >> 6) & 1) != 0;
int Offset = (Packed >> 7) & 0x3fff; int Offset = (Packed >> 7) & 0x3fff;