From 5b8baae482a4abd068ab69607469673f0eb51b9c Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Mon, 23 Jul 2018 15:32:16 -0300
Subject: [PATCH] Some cleanup

---
 Ryujinx.HLE/Gpu/Engines/NvGpuEngine3d.cs | 40 +++++++++---------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/Ryujinx.HLE/Gpu/Engines/NvGpuEngine3d.cs b/Ryujinx.HLE/Gpu/Engines/NvGpuEngine3d.cs
index d4525cdb8f..3dd0e98e60 100644
--- a/Ryujinx.HLE/Gpu/Engines/NvGpuEngine3d.cs
+++ b/Ryujinx.HLE/Gpu/Engines/NvGpuEngine3d.cs
@@ -25,9 +25,7 @@ namespace Ryujinx.HLE.Gpu.Engines
 
         private HashSet<long> FrameBuffers;
 
-        private List<long> UploadedIndexes;
-        private List<long> UploadedVertices;
-        private List<long> UploadedTextures;
+        private List<long>[] UploadedKeys;
 
         public NvGpuEngine3d(NvGpu Gpu)
         {
@@ -62,9 +60,12 @@ namespace Ryujinx.HLE.Gpu.Engines
 
             FrameBuffers = new HashSet<long>();
 
-            UploadedIndexes  = new List<long>();
-            UploadedVertices = new List<long>();
-            UploadedTextures = new List<long>();
+            UploadedKeys = new List<long>[(int)NvGpuBufferType.Count];
+
+            for (int i = 0; i < UploadedKeys.Length; i++)
+            {
+                UploadedKeys[i] = new List<long>();
+            }
         }
 
         public void CallMethod(NvGpuVmm Vmm, NvGpuPBEntry PBEntry)
@@ -528,8 +529,6 @@ namespace Ryujinx.HLE.Gpu.Engines
                     {
                         Gpu.Renderer.Texture.Bind(Key, TexIndex);
 
-                        UploadedIndexes.Add(Key);
-
                         HasCachedTexture = true;
                     }
                 }
@@ -702,9 +701,10 @@ namespace Ryujinx.HLE.Gpu.Engines
 
             if (Mode == 0)
             {
-                UploadedIndexes.Clear();
-                UploadedVertices.Clear();
-                UploadedTextures.Clear();
+                foreach (List<long> Uploaded in UploadedKeys)
+                {
+                    Uploaded.Clear();
+                }
 
                 //Write mode.
                 Vmm.WriteInt32(Position, Seq);
@@ -791,28 +791,16 @@ namespace Ryujinx.HLE.Gpu.Engines
 
         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;
             }
 
-            UploadedKeys.Add(Key);
+            Uploaded.Add(Key);
 
             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));
-            }
-        }
     }
 }
\ No newline at end of file