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

Some cleanup

Browse source
This commit is contained in:
ReinUsesLisp 2018-07-23 15:32:16 -03:00
commit 5b8baae482
1 changed files with 14 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Ryujinx.HLE/Gpu/Engines/NvGpuEngine3d.cs
View file

@ -25,9 +25,7 @@ namespace Ryujinx.HLE.Gpu.Engines
private HashSet<long> FrameBuffers; private HashSet<long> FrameBuffers;
private List<long> UploadedIndexes; private List<long>[] UploadedKeys;
private List<long> UploadedVertices;
private List<long> UploadedTextures;
public NvGpuEngine3d(NvGpu Gpu) public NvGpuEngine3d(NvGpu Gpu)
{ {
@ -62,9 +60,12 @@ namespace Ryujinx.HLE.Gpu.Engines
FrameBuffers = new HashSet<long>(); FrameBuffers = new HashSet<long>();
UploadedIndexes = new List<long>(); UploadedKeys = new List<long>[(int)NvGpuBufferType.Count];
UploadedVertices = new List<long>();
UploadedTextures = new List<long>(); for (int i = 0; i < UploadedKeys.Length; i++)
{
UploadedKeys[i] = new List<long>();
}
} }
public void CallMethod(NvGpuVmm Vmm, NvGpuPBEntry PBEntry) public void CallMethod(NvGpuVmm Vmm, NvGpuPBEntry PBEntry)
@ -528,8 +529,6 @@ namespace Ryujinx.HLE.Gpu.Engines
{ {
Gpu.Renderer.Texture.Bind(Key, TexIndex); Gpu.Renderer.Texture.Bind(Key, TexIndex);
UploadedIndexes.Add(Key);
HasCachedTexture = true; HasCachedTexture = true;
} }
} }
@ -702,9 +701,10 @@ namespace Ryujinx.HLE.Gpu.Engines
if (Mode == 0) if (Mode == 0)
{ {
UploadedIndexes.Clear(); foreach (List<long> Uploaded in UploadedKeys)
UploadedVertices.Clear(); {
UploadedTextures.Clear(); Uploaded.Clear();
}
//Write mode. //Write mode.
Vmm.WriteInt32(Position, Seq); Vmm.WriteInt32(Position, Seq);
@ -791,28 +791,16 @@ namespace Ryujinx.HLE.Gpu.Engines
private bool QueryKeyUpload(NvGpuVmm Vmm, long Key, long Size, NvGpuBufferType Type) private bool QueryKeyUpload(NvGpuVmm Vmm, long Key, long Size, NvGpuBufferType Type)
{ {
List<long> UploadedKeys = TypeUploadedList(Type); List<long> Uploaded = UploadedKeys[(int)Type];
if (UploadedKeys.Contains(Key)) if (Uploaded.Contains(Key))
{ {
return false; return false;
} }
UploadedKeys.Add(Key); Uploaded.Add(Key);
return Vmm.IsRegionModified(Key, Size, Type); return Vmm.IsRegionModified(Key, Size, Type);
} }
private List<long> TypeUploadedList(NvGpuBufferType Type)
{
switch (Type)
{
case NvGpuBufferType.Index: return UploadedIndexes;
case NvGpuBufferType.Vertex: return UploadedVertices;
case NvGpuBufferType.Texture: return UploadedTextures;
default: throw new ArgumentException(nameof(Type));
}
}
} }
} }