From 9cb57fb4bb3bbae0ae052a5af4a96a49fc5d864d Mon Sep 17 00:00:00 2001
From: Alex Barney <thealexbarney@gmail.com>
Date: Tue, 30 Oct 2018 19:43:02 -0600
Subject: Adjust naming conventions for Ryujinx and ChocolArm64 projects (#484)

* Change naming convention for Ryujinx project

* Change naming convention for ChocolArm64 project

* Fix NaN

* Remove unneeded this. from Ryujinx project

* Adjust naming from new PRs

* Name changes based on feedback

* How did this get removed?

* Rebasing fix

* Change FP enum case

* Remove prefix from ChocolArm64 classes - Part 1

* Remove prefix from ChocolArm64 classes - Part 2

* Fix alignment from last commit's renaming

* Rename namespaces

* Rename stragglers

* Fix alignment

* Rename OpCode class

* Missed a few

* Adjust alignment
---
 Ryujinx.Graphics/Texture/ImageUtils.cs    | 6 +++---
 Ryujinx.Graphics/Texture/TextureHelper.cs | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'Ryujinx.Graphics/Texture')

diff --git a/Ryujinx.Graphics/Texture/ImageUtils.cs b/Ryujinx.Graphics/Texture/ImageUtils.cs
index d2172c2e..97da17a0 100644
--- a/Ryujinx.Graphics/Texture/ImageUtils.cs
+++ b/Ryujinx.Graphics/Texture/ImageUtils.cs
@@ -216,9 +216,9 @@ namespace Ryujinx.Graphics.Texture
             throw new NotImplementedException(Format.ToString());
         }
 
-        public static byte[] ReadTexture(IAMemory Memory, GalImage Image, long Position)
+        public static byte[] ReadTexture(IMemory Memory, GalImage Image, long Position)
         {
-            AMemory CpuMemory;
+            MemoryManager CpuMemory;
 
             if (Memory is NvGpuVmm Vmm)
             {
@@ -226,7 +226,7 @@ namespace Ryujinx.Graphics.Texture
             }
             else
             {
-                CpuMemory = (AMemory)Memory;
+                CpuMemory = (MemoryManager)Memory;
             }
 
             ISwizzle Swizzle = TextureHelper.GetSwizzle(Image);
diff --git a/Ryujinx.Graphics/Texture/TextureHelper.cs b/Ryujinx.Graphics/Texture/TextureHelper.cs
index 9e966e6b..6ac91d8b 100644
--- a/Ryujinx.Graphics/Texture/TextureHelper.cs
+++ b/Ryujinx.Graphics/Texture/TextureHelper.cs
@@ -27,16 +27,16 @@ namespace Ryujinx.Graphics.Texture
             }
         }
 
-        public static (AMemory Memory, long Position) GetMemoryAndPosition(
-            IAMemory Memory,
-            long     Position)
+        public static (MemoryManager Memory, long Position) GetMemoryAndPosition(
+            IMemory Memory,
+            long    Position)
         {
             if (Memory is NvGpuVmm Vmm)
             {
                 return (Vmm.Memory, Vmm.GetPhysicalAddress(Position));
             }
 
-            return ((AMemory)Memory, Position);
+            return ((MemoryManager)Memory, Position);
         }
     }
 }
-- 
cgit v1.2.3